diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 047555f60..739e43f2f 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -112,6 +112,12 @@ resources: notice_path: NOTICE.md ref: v${image_tag} url: https://github.com/grafana/grafana + - container_image: docker.io/grafana/grafana:10.0.3 + sources: + - license_path: LICENSE + notice_path: NOTICE.md + ref: v${image_tag} + url: https://github.com/grafana/grafana - container_image: docker.io/grafana/loki:2.8.2 sources: - license_path: LICENSE @@ -548,13 +554,13 @@ resources: - license_path: LICENSE ref: nfs-provisioner-${image_tag} url: https://github.com/kubernetes-retired/external-storage - - container_image: quay.io/prometheus-operator/prometheus-config-reloader:v0.65.2 + - container_image: quay.io/prometheus-operator/prometheus-config-reloader:v0.66.0 sources: - license_path: LICENSE notice_path: NOTICE ref: ${image_tag} url: https://github.com/prometheus-operator/prometheus-operator - - container_image: quay.io/prometheus-operator/prometheus-operator:v0.65.2 + - container_image: quay.io/prometheus-operator/prometheus-operator:v0.66.0 sources: - license_path: LICENSE notice_path: NOTICE @@ -572,7 +578,7 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/prometheus/alertmanager - - container_image: quay.io/prometheus/node-exporter:v1.5.0 + - container_image: quay.io/prometheus/node-exporter:v1.6.0 sources: - license_path: LICENSE notice_path: NOTICE @@ -584,7 +590,7 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/prometheus/prometheus - - container_image: quay.io/prometheus/prometheus:v2.44.0 + - container_image: quay.io/prometheus/prometheus:v2.45.0 sources: - license_path: LICENSE notice_path: NOTICE diff --git a/services/kube-prometheus-stack/46.8.0/defaults/cm.yaml b/services/kube-prometheus-stack/48.3.1/defaults/cm.yaml similarity index 99% rename from services/kube-prometheus-stack/46.8.0/defaults/cm.yaml rename to services/kube-prometheus-stack/48.3.1/defaults/cm.yaml index d5ec872e5..db13a8425 100644 --- a/services/kube-prometheus-stack/46.8.0/defaults/cm.yaml +++ b/services/kube-prometheus-stack/48.3.1/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kube-prometheus-stack-46.8.0-d2iq-defaults + name: kube-prometheus-stack-48.3.1-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/kube-prometheus-stack/46.8.0/defaults/kustomization.yaml b/services/kube-prometheus-stack/48.3.1/defaults/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/defaults/kustomization.yaml rename to services/kube-prometheus-stack/48.3.1/defaults/kustomization.yaml diff --git a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy.yaml b/services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy.yaml similarity index 92% rename from services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy.yaml rename to services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy.yaml index 8882afa31..3b86d654f 100644 --- a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy.yaml +++ b/services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy + path: ./services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy sourceRef: kind: GitRepository name: management diff --git a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/cert.yaml b/services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy/cert.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/cert.yaml rename to services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy/cert.yaml diff --git a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/client-rbac.yaml b/services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy/client-rbac.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/client-rbac.yaml rename to services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy/client-rbac.yaml diff --git a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/kube-rbac-proxy.yaml b/services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy/kube-rbac-proxy.yaml similarity index 97% rename from services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/kube-rbac-proxy.yaml rename to services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy/kube-rbac-proxy.yaml index 994a674d9..e0c14d618 100644 --- a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/kube-rbac-proxy.yaml +++ b/services/kube-prometheus-stack/48.3.1/etcd-metrics-proxy/kube-rbac-proxy.yaml @@ -78,8 +78,8 @@ spec: command: ["/bin/sh", "-c"] args: - > - cp /etc/certs/etcd/ca.crt /etc/certs/etcd/healthcheck* /etc/kube-rbac-proxy/etcd/ && - chown -R 65532:65532 /etc/kube-rbac-proxy/etcd + cp /etc/certs/etcd/ca.crt /etc/certs/etcd/healthcheck* /etc/kube-rbac-proxy/etcd/ && chown -R 65532:65532 /etc/kube-rbac-proxy/etcd + securityContext: runAsUser: 0 privileged: true diff --git a/services/kube-prometheus-stack/46.8.0/grafana-dashboards/calico.json b/services/kube-prometheus-stack/48.3.1/grafana-dashboards/calico.json similarity index 100% rename from services/kube-prometheus-stack/46.8.0/grafana-dashboards/calico.json rename to services/kube-prometheus-stack/48.3.1/grafana-dashboards/calico.json diff --git a/services/kube-prometheus-stack/46.8.0/grafana-dashboards/controller-runtime.json b/services/kube-prometheus-stack/48.3.1/grafana-dashboards/controller-runtime.json similarity index 100% rename from services/kube-prometheus-stack/46.8.0/grafana-dashboards/controller-runtime.json rename to services/kube-prometheus-stack/48.3.1/grafana-dashboards/controller-runtime.json diff --git a/services/kube-prometheus-stack/46.8.0/grafana-dashboards/flux-cluster-stats.json b/services/kube-prometheus-stack/48.3.1/grafana-dashboards/flux-cluster-stats.json similarity index 100% rename from services/kube-prometheus-stack/46.8.0/grafana-dashboards/flux-cluster-stats.json rename to services/kube-prometheus-stack/48.3.1/grafana-dashboards/flux-cluster-stats.json diff --git a/services/kube-prometheus-stack/46.8.0/grafana-dashboards/flux-control-plane.json b/services/kube-prometheus-stack/48.3.1/grafana-dashboards/flux-control-plane.json similarity index 100% rename from services/kube-prometheus-stack/46.8.0/grafana-dashboards/flux-control-plane.json rename to services/kube-prometheus-stack/48.3.1/grafana-dashboards/flux-control-plane.json diff --git a/services/kube-prometheus-stack/46.8.0/grafana-dashboards/kustomization.yaml b/services/kube-prometheus-stack/48.3.1/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/grafana-dashboards/kustomization.yaml rename to services/kube-prometheus-stack/48.3.1/grafana-dashboards/kustomization.yaml diff --git a/services/kube-prometheus-stack/46.8.0/helmrelease.yaml b/services/kube-prometheus-stack/48.3.1/helmrelease.yaml similarity index 91% rename from services/kube-prometheus-stack/46.8.0/helmrelease.yaml rename to services/kube-prometheus-stack/48.3.1/helmrelease.yaml index d4676f7c6..47116db9e 100644 --- a/services/kube-prometheus-stack/46.8.0/helmrelease.yaml +++ b/services/kube-prometheus-stack/48.3.1/helmrelease.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/kube-prometheus-stack/46.8.0/helmrelease + path: ./services/kube-prometheus-stack/48.3.1/helmrelease sourceRef: kind: GitRepository name: management diff --git a/services/kube-prometheus-stack/46.8.0/helmrelease/extra-images.txt b/services/kube-prometheus-stack/48.3.1/helmrelease/extra-images.txt similarity index 100% rename from services/kube-prometheus-stack/46.8.0/helmrelease/extra-images.txt rename to services/kube-prometheus-stack/48.3.1/helmrelease/extra-images.txt diff --git a/services/kube-prometheus-stack/46.8.0/helmrelease/kube-prometheus-stack.yaml b/services/kube-prometheus-stack/48.3.1/helmrelease/kube-prometheus-stack.yaml similarity index 95% rename from services/kube-prometheus-stack/46.8.0/helmrelease/kube-prometheus-stack.yaml rename to services/kube-prometheus-stack/48.3.1/helmrelease/kube-prometheus-stack.yaml index e29a45ad9..8191e0b17 100644 --- a/services/kube-prometheus-stack/46.8.0/helmrelease/kube-prometheus-stack.yaml +++ b/services/kube-prometheus-stack/48.3.1/helmrelease/kube-prometheus-stack.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-charts-staging namespace: kommander-flux - version: 46.8.0 + version: 48.3.1 interval: 15s install: timeout: 5m0s @@ -27,7 +27,7 @@ spec: releaseName: kube-prometheus-stack valuesFrom: - kind: ConfigMap - name: kube-prometheus-stack-46.8.0-d2iq-defaults + name: kube-prometheus-stack-48.3.1-d2iq-defaults - kind: ConfigMap name: kube-prometheus-stack-mgmt-overrides optional: true @@ -46,7 +46,7 @@ data: docsLink: "https://prometheus.io/docs/" # Prometheus app version can be found at prometheus.prometheusSpec.image.tag: # https://github.com/mesosphere/charts/blob/master/staging/kube-prometheus-stack/values.yaml#L2147 - version: "2.44.0" + version: "2.45.0" --- apiVersion: v1 kind: ConfigMap @@ -77,4 +77,4 @@ data: # Since Grafana is a subchart of kube-prometheus-stack, get the version of the Grafana chart dependency at: # https://github.com/mesosphere/charts/tree/master/staging/kube-prometheus-stack/charts # Then, check https://artifacthub.io/packages/helm/grafana/grafana/ for app version - version: "9.5.3" + version: "10.0.3" diff --git a/services/kube-prometheus-stack/46.8.0/helmrelease/kustomization.yaml b/services/kube-prometheus-stack/48.3.1/helmrelease/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/helmrelease/kustomization.yaml rename to services/kube-prometheus-stack/48.3.1/helmrelease/kustomization.yaml diff --git a/services/kube-prometheus-stack/46.8.0/kustomization.yaml b/services/kube-prometheus-stack/48.3.1/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/kustomization.yaml rename to services/kube-prometheus-stack/48.3.1/kustomization.yaml diff --git a/services/kube-prometheus-stack/metadata.yaml b/services/kube-prometheus-stack/metadata.yaml index 8b67ebdb5..ebe212bb6 100644 --- a/services/kube-prometheus-stack/metadata.yaml +++ b/services/kube-prometheus-stack/metadata.yaml @@ -16,7 +16,7 @@ overview: |- ## Dashboards By deploying the Prometheus Monitoring Stack, the following platform applications and their respective dashboards will be deployed. After deployment to clusters in a workspace, the dashboards will be available to access from a respective cluster's detail page. - ### Prometheus (v2.41.0) + ### Prometheus (v2.45.0) A software application for event monitoring and alerting. It records real-time metrics in a time series database built using a HTTP pull model, with flexible and real-time alerting. @@ -27,7 +27,7 @@ overview: |- - [Prometheus Alertmanager Documentation - Overview](https://prometheus.io/docs/alerting/latest/alertmanager/) - ### Grafana (v9.3.1) + ### Grafana (v10.0.3) A monitoring dashboard from Grafana that can be used to visualize metrics collected by Prometheus. - [Grafana Documentation](https://grafana.com/docs/)