diff --git a/enterprise/prometheus/17.2.2/charts/common-18.0.2.tgz b/enterprise/prometheus/17.2.2/charts/common-18.0.2.tgz deleted file mode 100644 index 1588b1d05a1..00000000000 Binary files a/enterprise/prometheus/17.2.2/charts/common-18.0.2.tgz and /dev/null differ diff --git a/enterprise/prometheus/17.2.2/charts/kube-state-metrics-6.2.1.tgz b/enterprise/prometheus/17.2.2/charts/kube-state-metrics-6.2.1.tgz deleted file mode 100644 index 414a9a56df7..00000000000 Binary files a/enterprise/prometheus/17.2.2/charts/kube-state-metrics-6.2.1.tgz and /dev/null differ diff --git a/enterprise/prometheus/17.2.2/charts/node-exporter-6.3.0.tgz b/enterprise/prometheus/17.2.2/charts/node-exporter-6.3.0.tgz deleted file mode 100644 index 639837e158b..00000000000 Binary files a/enterprise/prometheus/17.2.2/charts/node-exporter-6.3.0.tgz and /dev/null differ diff --git a/enterprise/prometheus/17.2.2/templates/exporters/core-dns/service.yaml b/enterprise/prometheus/17.2.2/templates/exporters/core-dns/service.yaml deleted file mode 100644 index 359c945de46..00000000000 --- a/enterprise/prometheus/17.2.2/templates/exporters/core-dns/service.yaml +++ /dev/null @@ -1,22 +0,0 @@ -{{- if and .Values.coreDns.enabled .Values.coreDns.service.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "kube-prometheus.fullname" . }}-coredns - namespace: {{ .Values.coreDns.namespace }} - labels: {{- include "kube-prometheus.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-coredns -spec: - clusterIP: None - ports: - - name: http-metrics - port: {{ .Values.coreDns.service.port }} - protocol: TCP - targetPort: {{ .Values.coreDns.service.targetPort }} - selector: - {{- if .Values.coreDns.service.selector }} -{{ toYaml .Values.coreDns.service.selector | indent 4 }} - {{- else}} - k8s-app: kube-dns - {{- end}} -{{- end }} diff --git a/enterprise/prometheus/17.2.2/templates/exporters/core-dns/servicemonitor.yaml b/enterprise/prometheus/17.2.2/templates/exporters/core-dns/servicemonitor.yaml deleted file mode 100644 index 8906b87f8e1..00000000000 --- a/enterprise/prometheus/17.2.2/templates/exporters/core-dns/servicemonitor.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if .Values.coreDns.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "kube-prometheus.fullname" . }}-coredns - namespace: {{ .Release.Namespace }} - labels: {{- include "kube-prometheus.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-coredns -spec: - jobLabel: k8s-app - selector: - matchLabels: - app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-coredns - namespaceSelector: - matchNames: - - {{ .Values.coreDns.namespace }} - endpoints: - - port: http-metrics - {{- if .Values.coreDns.serviceMonitor.interval}} - interval: {{ .Values.coreDns.serviceMonitor.interval }} - {{- end }} - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - {{- if .Values.coreDns.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.coreDns.serviceMonitor.metricRelabelings "context" $) | nindent 6 }} - {{- end }} - {{- if .Values.coreDns.serviceMonitor.relabelings }} - relabelings: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.coreDns.serviceMonitor.relabelings "context" $) | nindent 6 }} - {{- end }} -{{- end }} diff --git a/enterprise/prometheus/17.2.2/templates/exporters/kube-apiserver/servicemonitor.yaml b/enterprise/prometheus/17.2.2/templates/exporters/kube-apiserver/servicemonitor.yaml deleted file mode 100644 index 7cfbb53f379..00000000000 --- a/enterprise/prometheus/17.2.2/templates/exporters/kube-apiserver/servicemonitor.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.kubeApiServer.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "kube-prometheus.fullname" . }}-apiserver - namespace: {{ .Release.Namespace }} - labels: {{- include "kube-prometheus.labels" . | nindent 4 }} - app.kubernetes.io/component: apiserver -spec: - jobLabel: component - selector: - matchLabels: - component: apiserver - provider: kubernetes - namespaceSelector: - matchNames: - - default - endpoints: - - port: https - scheme: https - tlsConfig: - caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - serverName: kubernetes - insecureSkipVerify: true - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - {{- if .Values.kubeApiServer.serviceMonitor.interval }} - interval: {{ .Values.kubeApiServer.serviceMonitor.interval }} - {{- end }} - {{- if .Values.kubeApiServer.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "tc.v1.common.tplvalues.render" ( dict "value" .Values.kubeApiServer.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} - {{- end }} - {{- if .Values.kubeApiServer.serviceMonitor.relabelings }} - relabelings: {{- toYaml .Values.kubeApiServer.serviceMonitor.relabelings | nindent 8 }} - {{- end }} -{{- end }} diff --git a/enterprise/prometheus/17.2.2/templates/exporters/kube-controller-manager/endpoints.yaml b/enterprise/prometheus/17.2.2/templates/exporters/kube-controller-manager/endpoints.yaml deleted file mode 100644 index 13aa60ebf66..00000000000 --- a/enterprise/prometheus/17.2.2/templates/exporters/kube-controller-manager/endpoints.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if and .Values.kubeControllerManager.enabled .Values.kubeControllerManager.endpoints }} -apiVersion: v1 -kind: Endpoints -metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager - namespace: {{ .Values.kubeControllerManager.namespace }} - labels: {{- include "kube-prometheus.labels" . | nindent 4 }} - app.kubernetes.io/component: kube-controller-manager -subsets: - - addresses: - {{- range .Values.kubeControllerManager.endpoints }} - - ip: {{ . }} - {{- end }} - ports: - - name: http-metrics - port: {{ .Values.kubeControllerManager.service.port }} - protocol: TCP -{{- end }} diff --git a/enterprise/prometheus/17.2.2/templates/exporters/kube-controller-manager/service.yaml b/enterprise/prometheus/17.2.2/templates/exporters/kube-controller-manager/service.yaml deleted file mode 100644 index 6a455359832..00000000000 --- a/enterprise/prometheus/17.2.2/templates/exporters/kube-controller-manager/service.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- if and .Values.kubeControllerManager.enabled .Values.kubeControllerManager.service.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager - namespace: {{ .Values.kubeControllerManager.namespace }} - labels: {{- include "kube-prometheus.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager -spec: - clusterIP: None - ports: - - name: http-metrics - port: {{ .Values.kubeControllerManager.service.port }} - protocol: TCP - targetPort: {{ .Values.kubeControllerManager.service.targetPort }} -{{- if .Values.kubeControllerManager.endpoints }}{{- else }} - selector: - {{- if .Values.kubeControllerManager.service.selector }} -{{ toYaml .Values.kubeControllerManager.service.selector | indent 4 }} - {{- else}} - component: kube-controller-manager - {{- end}} -{{- end }} - type: ClusterIP -{{- end }} diff --git a/enterprise/prometheus/17.2.2/templates/exporters/kube-controller-manager/servicemonitor.yaml b/enterprise/prometheus/17.2.2/templates/exporters/kube-controller-manager/servicemonitor.yaml deleted file mode 100644 index d3f56c49914..00000000000 --- a/enterprise/prometheus/17.2.2/templates/exporters/kube-controller-manager/servicemonitor.yaml +++ /dev/null @@ -1,40 +0,0 @@ -{{- if .Values.kubeControllerManager.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager - namespace: {{ .Release.Namespace }} - labels: {{- include "kube-prometheus.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager -spec: - jobLabel: component - selector: - matchLabels: - app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager - namespaceSelector: - matchNames: - - {{ .Values.kubeControllerManager.namespace }} - endpoints: - - port: http-metrics - {{- if .Values.kubeControllerManager.serviceMonitor.interval }} - interval: {{ .Values.kubeControllerManager.serviceMonitor.interval }} - {{- end }} - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - {{- if .Values.kubeControllerManager.serviceMonitor.https }} - scheme: https - tlsConfig: - caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - {{- if .Values.kubeControllerManager.serviceMonitor.insecureSkipVerify }} - insecureSkipVerify: {{ .Values.kubeControllerManager.serviceMonitor.insecureSkipVerify }} - {{- end }} - {{- if .Values.kubeControllerManager.serviceMonitor.serverName }} - serverName: {{ .Values.kubeControllerManager.serviceMonitor.serverName }} - {{- end }} - {{- end }} - {{- if .Values.kubeControllerManager.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.kubeControllerManager.serviceMonitor.metricRelabelings "context" $) | nindent 6 }} - {{- end }} - {{- if .Values.kubeControllerManager.serviceMonitor.relabelings }} - relabelings: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.kubeControllerManager.serviceMonitor.relabelings "context" $) | nindent 6 }} - {{- end }} -{{- end }} diff --git a/enterprise/prometheus/17.2.2/templates/exporters/kube-scheduler/endpoints.yaml b/enterprise/prometheus/17.2.2/templates/exporters/kube-scheduler/endpoints.yaml deleted file mode 100644 index dde3d8b9110..00000000000 --- a/enterprise/prometheus/17.2.2/templates/exporters/kube-scheduler/endpoints.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if and .Values.kubeScheduler.enabled .Values.kubeScheduler.endpoints }} -apiVersion: v1 -kind: Endpoints -metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler - namespace: {{ .Values.kubeScheduler.namespace }} - labels: {{- include "kube-prometheus.labels" . | nindent 4 }} - app.kubernetes.io/component: kube-scheduler -subsets: - - addresses: - {{- range .Values.kubeScheduler.endpoints }} - - ip: {{ . }} - {{- end }} - ports: - - name: http-metrics - port: {{ .Values.kubeScheduler.service.port }} - protocol: TCP -{{- end }} diff --git a/enterprise/prometheus/17.2.2/templates/exporters/kube-scheduler/service.yaml b/enterprise/prometheus/17.2.2/templates/exporters/kube-scheduler/service.yaml deleted file mode 100644 index aad5969f5fd..00000000000 --- a/enterprise/prometheus/17.2.2/templates/exporters/kube-scheduler/service.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- if and .Values.kubeScheduler.enabled .Values.kubeScheduler.service.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler - namespace: {{ .Values.kubeScheduler.namespace }} - labels: {{- include "kube-prometheus.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-kube-scheduler -spec: - clusterIP: None - ports: - - name: http-metrics - port: {{ .Values.kubeScheduler.service.port}} - protocol: TCP - targetPort: {{ .Values.kubeScheduler.service.targetPort}} -{{- if .Values.kubeScheduler.endpoints }}{{- else }} - selector: - {{- if .Values.kubeScheduler.service.selector }} -{{ toYaml .Values.kubeScheduler.service.selector | indent 4 }} - {{- else}} - component: kube-scheduler - {{- end}} -{{- end }} - type: ClusterIP -{{- end -}} diff --git a/enterprise/prometheus/17.2.2/templates/exporters/kube-scheduler/servicemonitor.yaml b/enterprise/prometheus/17.2.2/templates/exporters/kube-scheduler/servicemonitor.yaml deleted file mode 100644 index 7cbe29f86d7..00000000000 --- a/enterprise/prometheus/17.2.2/templates/exporters/kube-scheduler/servicemonitor.yaml +++ /dev/null @@ -1,40 +0,0 @@ -{{- if .Values.kubeScheduler.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler - namespace: {{ .Release.Namespace }} - labels: {{- include "kube-prometheus.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-kube-scheduler -spec: - jobLabel: component - selector: - matchLabels: - app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-kube-scheduler - namespaceSelector: - matchNames: - - {{ .Values.kubeScheduler.namespace }} - endpoints: - - port: http-metrics - {{- if .Values.kubeScheduler.serviceMonitor.interval }} - interval: {{ .Values.kubeScheduler.serviceMonitor.interval }} - {{- end }} - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - {{- if .Values.kubeScheduler.serviceMonitor.https }} - scheme: https - tlsConfig: - caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - {{- if .Values.kubeScheduler.serviceMonitor.insecureSkipVerify }} - insecureSkipVerify: {{ .Values.kubeScheduler.serviceMonitor.insecureSkipVerify }} - {{- end}} - {{- if .Values.kubeScheduler.serviceMonitor.serverName }} - serverName: {{ .Values.kubeScheduler.serviceMonitor.serverName }} - {{- end}} - {{- end}} - {{- if .Values.kubeScheduler.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.kubeScheduler.serviceMonitor.metricRelabelings "context" $) | nindent 6 }} - {{- end }} - {{- if .Values.kubeScheduler.serviceMonitor.relabelings }} - metricRelabelings: {{- include "tc.v1.common.tplvalues.render" (dict "value" .Values.kubeScheduler.serviceMonitor.relabelings "context" $) | nindent 6 }} - {{- end }} -{{- end }} diff --git a/enterprise/prometheus/17.2.2/templates/exporters/kubelet/servicemonitor.yaml b/enterprise/prometheus/17.2.2/templates/exporters/kubelet/servicemonitor.yaml deleted file mode 100644 index b109d78c453..00000000000 --- a/enterprise/prometheus/17.2.2/templates/exporters/kubelet/servicemonitor.yaml +++ /dev/null @@ -1,85 +0,0 @@ -{{- if .Values.kubelet.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ template "kube-prometheus.fullname" . }}-kubelet - namespace: {{ .Release.Namespace }} - labels: {{- include "kube-prometheus.labels" . | nindent 4 }} - app.kubernetes.io/component: kubelet -spec: - jobLabel: k8s-app - selector: - matchLabels: - k8s-app: kubelet - namespaceSelector: - matchNames: - - {{ .Values.kubelet.namespace }} - endpoints: - {{- if .Values.kubelet.serviceMonitor.https }} - - port: https-metrics - scheme: https - tlsConfig: - caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - serverName: kubernetes - insecureSkipVerify: true - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - honorLabels: true - {{- if .Values.kubelet.serviceMonitor.interval }} - interval: {{ .Values.kubelet.serviceMonitor.interval }} - {{- end }} - {{- if .Values.kubelet.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "tc.v1.common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} - {{- end }} - {{- if .Values.kubelet.serviceMonitor.relabelings }} - relabelings: {{- toYaml .Values.kubelet.serviceMonitor.relabelings | nindent 8 }} - {{- end }} - - port: https-metrics - path: /metrics/cadvisor - scheme: https - tlsConfig: - caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - serverName: kubernetes - insecureSkipVerify: true - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - honorLabels: true - {{- if .Values.kubelet.serviceMonitor.interval }} - interval: {{ .Values.kubelet.serviceMonitor.interval }} - {{- end }} - {{- if .Values.kubelet.serviceMonitor.cAdvisorMetricRelabelings }} - metricRelabelings: {{- include "tc.v1.common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.cAdvisorMetricRelabelings "context" $) | nindent 8 }} - {{- end }} - {{- if .Values.kubelet.serviceMonitor.cAdvisorRelabelings }} - relabelings: {{- toYaml .Values.kubelet.serviceMonitor.cAdvisorRelabelings | nindent 8 }} - {{- end }} - {{- else }} - - port: http-metrics - scheme: http - tlsConfig: - insecureSkipVerify: false - honorLabels: true - {{- if .Values.kubelet.serviceMonitor.interval }} - interval: {{ .Values.kubelet.serviceMonitor.interval }} - {{- end }} - {{- if .Values.kubelet.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "tc.v1.common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} - {{- end }} - {{- if .Values.kubelet.serviceMonitor.relabelings }} - relabelings: {{- toYaml .Values.kubelet.serviceMonitor.relabelings | nindent 8 }} - {{- end }} - - port: http-metrics - path: /metrics/cadvisor - scheme: http - tlsConfig: - insecureSkipVerify: false - honorLabels: true - {{- if .Values.kubelet.serviceMonitor.interval }} - interval: {{ .Values.kubelet.serviceMonitor.interval }} - {{- end }} - {{- if .Values.kubelet.serviceMonitor.cAdvisorMetricRelabelings }} - metricRelabelings: {{- include "tc.v1.common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.cAdvisorMetricRelabelings "context" $) | nindent 8 }} - {{- end }} - {{- if .Values.kubelet.serviceMonitor.cAdvisorRelabelings }} - relabelings: {{- toYaml .Values.kubelet.serviceMonitor.cAdvisorRelabelings | nindent 8 }} - {{- end }} - {{- end }} -{{- end }} diff --git a/enterprise/prometheus/17.2.2/.helmignore b/enterprise/prometheus/17.4.2/.helmignore similarity index 100% rename from enterprise/prometheus/17.2.2/.helmignore rename to enterprise/prometheus/17.4.2/.helmignore diff --git a/enterprise/prometheus/17.2.2/CHANGELOG.md b/enterprise/prometheus/17.4.2/CHANGELOG.md similarity index 96% rename from enterprise/prometheus/17.2.2/CHANGELOG.md rename to enterprise/prometheus/17.4.2/CHANGELOG.md index e6120674bf4..b2a384050e5 100644 --- a/enterprise/prometheus/17.2.2/CHANGELOG.md +++ b/enterprise/prometheus/17.4.2/CHANGELOG.md @@ -38,6 +38,10 @@ title: Changelog + + + + @@ -93,7 +97,4 @@ title: Changelog ## [prometheus-16.4.4](https://github.com/truecharts/charts/compare/prometheus-16.4.3...prometheus-16.4.4) (2024-02-04) -## [prometheus-16.4.3](https://github.com/truecharts/charts/compare/prometheus-16.4.2...prometheus-16.4.3) (2024-02-03) - -### Chore - +## [prometheus-16.4.3](https://github.com/truecharts/charts/compare/prometheus-16.4.2...prometheus-16.4.3) (2024-02-03) \ No newline at end of file diff --git a/enterprise/prometheus/17.2.2/Chart.yaml b/enterprise/prometheus/17.4.2/Chart.yaml similarity index 77% rename from enterprise/prometheus/17.2.2/Chart.yaml rename to enterprise/prometheus/17.4.2/Chart.yaml index 65cc5938edc..cb43f1fd552 100644 --- a/enterprise/prometheus/17.2.2/Chart.yaml +++ b/enterprise/prometheus/17.4.2/Chart.yaml @@ -10,24 +10,17 @@ apiVersion: v2 appVersion: 2.49.1 dependencies: - name: common - version: 18.0.2 + version: 18.0.3 repository: oci://tccr.io/truecharts condition: "" alias: "" tags: [] import-values: [] - - name: node-exporter - version: 6.3.0 - repository: oci://tccr.io/truecharts - condition: exporters.enabled,exporters.node-exporter.enabled - alias: "" - tags: [] - import-values: [] - - name: kube-state-metrics - version: 6.2.1 - repository: oci://tccr.io/truecharts - condition: exporters.enabled,exporters.kube-state-metrics.enabled - alias: "" + - name: kube-prometheus-stack + version: 56.9.0 + repository: oci://ghcr.io/prometheus-community/charts + condition: "" + alias: kps tags: [] import-values: [] deprecated: false @@ -50,4 +43,4 @@ sources: - https://quay.io/thanos/thanos - https://hub.docker.com/r/bitnami/alertmanager type: application -version: 17.2.2 +version: 17.4.2 diff --git a/enterprise/prometheus/17.2.2/README.md b/enterprise/prometheus/17.4.2/README.md similarity index 100% rename from enterprise/prometheus/17.2.2/README.md rename to enterprise/prometheus/17.4.2/README.md diff --git a/enterprise/prometheus/17.2.2/app-readme.md b/enterprise/prometheus/17.4.2/app-readme.md similarity index 100% rename from enterprise/prometheus/17.2.2/app-readme.md rename to enterprise/prometheus/17.4.2/app-readme.md diff --git a/enterprise/prometheus/17.4.2/charts/common-18.0.3.tgz b/enterprise/prometheus/17.4.2/charts/common-18.0.3.tgz new file mode 100644 index 00000000000..94e930e88c1 Binary files /dev/null and b/enterprise/prometheus/17.4.2/charts/common-18.0.3.tgz differ diff --git a/enterprise/prometheus/17.4.2/charts/kube-prometheus-stack-56.9.0.tgz b/enterprise/prometheus/17.4.2/charts/kube-prometheus-stack-56.9.0.tgz new file mode 100644 index 00000000000..1b0175276f4 Binary files /dev/null and b/enterprise/prometheus/17.4.2/charts/kube-prometheus-stack-56.9.0.tgz differ diff --git a/enterprise/prometheus/17.2.2/ix_values.yaml b/enterprise/prometheus/17.4.2/ix_values.yaml similarity index 83% rename from enterprise/prometheus/17.2.2/ix_values.yaml rename to enterprise/prometheus/17.4.2/ix_values.yaml index 15cc0335ef7..a0cccf4d013 100644 --- a/enterprise/prometheus/17.2.2/ix_values.yaml +++ b/enterprise/prometheus/17.4.2/ix_values.yaml @@ -1,6 +1,6 @@ image: repository: bitnami/prometheus - tag: 2.49.1@sha256:74f722ec51ac19d3a0801b418ec0f120e22f751dbd826ea24d72a0711cde9b54 + tag: 2.50.0@sha256:5c06e840a870a4a279406f0d0a73c3ca33fcf0adf6464153e273206118be0c29 thanosImage: repository: quay.io/thanos/thanos tag: v0.34.1@sha256:567346c3f6ff2927c2c6c0daad977b2213f62d45eca54d48afd19e6deb902181 @@ -54,6 +54,125 @@ grafana: scrapeInterval: "30s" uid: "prometheus" +kps: + ## Install Prometheus Operator CRDs + ## + crds: + enabled: false + + ## Manages Prometheus and Alertmanager components + ## + prometheusOperator: + enabled: false + + ## + global: + rbac: + create: true + + ## Create default rules for monitoring the cluster + ## + defaultRules: + create: true + + windowsMonitoring: + ## Deploys the windows-exporter and Windows-specific dashboards and rules (job name must be 'windows-exporter') + enabled: false + + ## Configuration for prometheus-windows-exporter + ## ref: https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-windows-exporter + ## + prometheus-windows-exporter: + ## Enable ServiceMonitor and set Kubernetes label to use as a job label + ## + prometheus: + monitor: + enabled: false + + ## Configuration for alertmanager + ## ref: https://prometheus.io/docs/alerting/alertmanager/ + ## + alertmanager: + ## Deploy alertmanager + ## + enabled: false + + ## Using default values from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml + ## + grafana: + enabled: false + forceDeployDashboards: true + defaultDashboardsEnabled: true + + ## Flag to disable all the kubernetes component scrapers + ## + kubernetesServiceMonitors: + enabled: true + + ## Component scraping the kube api server + ## + kubeApiServer: + enabled: true + + ## Component scraping the kubelet and kubelet-hosted cAdvisor + ## + kubelet: + enabled: true + + ## Component scraping the kube controller manager + ## + kubeControllerManager: + enabled: true + + ## Component scraping coreDns. Use either this or kubeDns + ## + coreDns: + enabled: true + + ## Component scraping kubeDns. Use either this or coreDns + ## + kubeDns: + enabled: false + + ## Component scraping etcd + ## + kubeEtcd: + enabled: true + + ## Component scraping kube scheduler + ## + kubeScheduler: + enabled: true + + ## Component scraping kube proxy + ## + kubeProxy: + enabled: false + + ## Component scraping kube state metrics + ## + kubeStateMetrics: + enabled: true + + ## dontDeploy node exporter as a daemonset to all nodes + ## + nodeExporter: + enabled: true + + ## dont Deploy a Prometheus instance + ## + prometheus: + enabled: false + + ## Configuration for thanosRuler + ## ref: https://thanos.io/tip/components/rule.md/ + ## + thanosRuler: + ## Dont Deploy thanosRuler + ## + enabled: false + + service: main: selectorLabels: @@ -205,8 +324,10 @@ serviceAccount: main: enabled: true primary: true + securityContext: readOnlyRootFilesystem: false + probes: # -- Liveness probe configuration # @default -- See below @@ -856,6 +977,7 @@ prometheus: ## @param prometheus.portName Port name used for the pods and governing service. This defaults to web ## portName: main + #### ## Alert Manager Config #### @@ -1133,245 +1255,7 @@ alertmanager: ## @param alertmanager.configSelector Namespaces to be selected for AlertmanagerConfig discovery. If nil, only check own namespace. This defaults to {} ## configSelector: {} -#### -## Exporters -#### -## @section Exporters - -## Exporters -## -exporters: - node-exporter: - ## @param exporters.node-exporter.enabled Enable node-exporter - ## - enabled: true - kube-state-metrics: - ## @param exporters.kube-state-metrics.enabled Enable kube-state-metrics - ## - enabled: true -## @param kube-state-metrics [object] Node Exporter deployment configuration -## -kube-state-metrics: - serviceMonitor: - enabled: true - honorLabels: true -## Component scraping for kubelet and kubelet hosted cAdvisor -## -kubelet: - ## @param kubelet.enabled Create a ServiceMonitor to scrape kubelet service - ## - enabled: true - ## @param kubelet.namespace Namespace where kubelet service is deployed. Related configuration `operator.kubeletService.namespace` - ## - namespace: kube-system - serviceMonitor: - ## @param kubelet.serviceMonitor.https Enable scraping of the kubelet over HTTPS - ## - https: true - ## @param kubelet.serviceMonitor.interval Scrape interval (use by default, falling back to Prometheus' default) - ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint - ## - interval: "" - ## @param kubelet.serviceMonitor.metricRelabelings Metric relabeling - ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs - ## - metricRelabelings: [] - ## @param kubelet.serviceMonitor.relabelings Relabel configs - ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config - ## - relabelings: [] - ## @param kubelet.serviceMonitor.cAdvisorMetricRelabelings Metric relabeling for scraping cAdvisor - ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs - ## - cAdvisorMetricRelabelings: [] - ## @param kubelet.serviceMonitor.cAdvisorRelabelings Relabel configs for scraping cAdvisor - ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs - ## - cAdvisorRelabelings: [] -## Component scraping the kube-apiserver -## -kubeApiServer: - ## @param kubeApiServer.enabled Create a ServiceMonitor to scrape kube-apiserver service - ## - enabled: true - serviceMonitor: - ## @param kubeApiServer.serviceMonitor.interval Scrape interval. If not set, the Prometheus default scrape interval is used. - ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint - ## - interval: "" - ## @param kubeApiServer.serviceMonitor.metricRelabelings Metric relabeling - ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs - ## - metricRelabelings: [] - ## @param kubeApiServer.serviceMonitor.relabelings Relabel configs - ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config - ## - relabelings: [] -## Component scraping the kube-controller-manager -## -kubeControllerManager: - ## @param kubeControllerManager.enabled Create a ServiceMonitor to scrape kube-controller-manager service - ## - enabled: false - ## @param kubeControllerManager.endpoints If your kube controller manager is not deployed as a pod, specify IPs it can be found on - ## endpoints: - ## - 10.141.4.22 - ## - 10.141.4.23 - ## - 10.141.4.24 - ## - endpoints: [] - ## @param kubeControllerManager.namespace Namespace where kube-controller-manager service is deployed. - ## - namespace: kube-system - ## Service ports and selector information - ## @param kubeControllerManager.service.enabled Whether or not to create a Service object for kube-controller-manager - ## @param kubeControllerManager.service.port Listening port of the kube-controller-manager Service object - ## @param kubeControllerManager.service.targetPort Port to target on the kube-controller-manager Pods. This should be the port that kube-controller-manager is exposing metrics on - ## @param kubeControllerManager.service.selector Optional PODs Label selector for the service - ## - service: - enabled: true - port: 10252 - targetPort: 10252 - ## selector: - ## component: kube-controller-manager - ## - selector: {} - serviceMonitor: - ## @param kubeControllerManager.serviceMonitor.interval Scrape interval (use by default, falling back to Prometheus' default) - ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#endpoint - ## - interval: "" - ## @param kubeControllerManager.serviceMonitor.https Enable scraping kube-controller-manager over https - ## Requires proper certs (not self-signed) and delegated authentication/authorization checks - ## - https: false - ## @param kubeControllerManager.serviceMonitor.insecureSkipVerify Skip TLS certificate validation when scraping - ## - insecureSkipVerify: "" - ## @param kubeControllerManager.serviceMonitor.serverName Name of the server to use when validating TLS certificate - serverName: "" - ## @param kubeControllerManager.serviceMonitor.metricRelabelings Metric relabeling - ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs - ## - metricRelabelings: [] - ## @param kubeControllerManager.serviceMonitor.relabelings Relabel configs - ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config - ## - relabelings: [] -## Component scraping kube scheduler -## -kubeScheduler: - ## @param kubeScheduler.enabled Create a ServiceMonitor to scrape kube-scheduler service - ## - enabled: false - ## @param kubeScheduler.endpoints If your kube scheduler is not deployed as a pod, specify IPs it can be found on - ## endpoints: - ## - 10.141.4.22 - ## - 10.141.4.23 - ## - 10.141.4.24 - ## - endpoints: [] - ## @param kubeScheduler.namespace Namespace where kube-scheduler service is deployed. - ## - namespace: kube-system - ## If using kubeScheduler.endpoints only the port and targetPort are used - ## @param kubeScheduler.service.enabled Whether or not to create a Service object for kube-scheduler - ## @param kubeScheduler.service.port Listening port of the kube scheduler Service object - ## @param kubeScheduler.service.targetPort Port to target on the kube scheduler Pods. This should be the port that kube scheduler is exposing metrics on - ## @param kubeScheduler.service.selector Optional PODs Label selector for the service - ## - service: - enabled: true - port: 10251 - targetPort: 10251 - ## selector: - ## component: kube-scheduler - ## - selector: {} - serviceMonitor: - ## @param kubeScheduler.serviceMonitor.interval Scrape interval (use by default, falling back to Prometheus' default) - ## - interval: "" - ## @param kubeScheduler.serviceMonitor.https Enable scraping kube-scheduler over https - ## Requires proper certs (not self-signed) and delegated authentication/authorization checks - ## - https: false - ## @param kubeScheduler.serviceMonitor.insecureSkipVerify Skip TLS certificate validation when scraping - ## - insecureSkipVerify: "" - ## @param kubeScheduler.serviceMonitor.serverName Name of the server to use when validating TLS certificate - ## - serverName: "" - ## @param kubeScheduler.serviceMonitor.metricRelabelings Metric relabeling - ## metricRelabelings: - ## - action: keep - ## regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - ## sourceLabels: [__name__] - ## - metricRelabelings: [] - ## @param kubeScheduler.serviceMonitor.relabelings Relabel configs - ## relabelings: - ## - sourceLabels: [__meta_kubernetes_pod_node_name] - ## separator: ; - ## regex: ^(.*)$ - ## targetLabel: nodename - ## replacement: $1 - ## action: replace - ## - relabelings: [] -## Component scraping coreDns -## -coreDns: - ## @param coreDns.enabled Create a ServiceMonitor to scrape coredns service - ## - enabled: true - ## @param coreDns.namespace Namespace where core dns service is deployed. - ## - namespace: kube-system - ## Create a ServiceMonitor to scrape coredns service - ## @param coreDns.service.enabled Whether or not to create a Service object for coredns - ## @param coreDns.service.port Listening port of the coredns Service object - ## @param coreDns.service.targetPort Port to target on the coredns Pods. This should be the port that coredns is exposing metrics on - ## @param coreDns.service.selector Optional PODs Label selector for the service - ## - service: - enabled: true - port: 9153 - targetPort: 9153 - ## selector: - ## component: kube-dns - ## - selector: {} - serviceMonitor: - ## @param coreDns.serviceMonitor.interval Scrape interval. If not set, the Prometheus default scrape interval is used. - ## - interval: "" - ## @param coreDns.serviceMonitor.metricRelabelings Metric relabel configs to apply to samples before ingestion. - ## metricRelabelings: - ## - action: keep - ## regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+' - ## sourceLabels: [__name__] - ## - metricRelabelings: [] - ## @param coreDns.serviceMonitor.relabelings Relabel configs to apply to samples before ingestion. - ## relabelings: - ## - sourceLabels: [__meta_kubernetes_pod_node_name] - ## separator: ; - ## regex: ^(.*)$ - ## targetLabel: nodename - ## replacement: $1 - ## action: replace - ## - relabelings: [] -## Component scraping the kube-proxy -## -kubeProxy: - ## @param kubeProxy.enabled Create a ServiceMonitor to scrape the kube-proxy Service - ## - enabled: false portal: open: enabled: true -updated: true diff --git a/enterprise/prometheus/17.2.2/questions.yaml b/enterprise/prometheus/17.4.2/questions.yaml similarity index 100% rename from enterprise/prometheus/17.2.2/questions.yaml rename to enterprise/prometheus/17.4.2/questions.yaml diff --git a/enterprise/prometheus/17.2.2/templates/NOTES.txt b/enterprise/prometheus/17.4.2/templates/NOTES.txt similarity index 100% rename from enterprise/prometheus/17.2.2/templates/NOTES.txt rename to enterprise/prometheus/17.4.2/templates/NOTES.txt diff --git a/enterprise/prometheus/17.2.2/templates/_helpers.tpl b/enterprise/prometheus/17.4.2/templates/_helpers.tpl similarity index 100% rename from enterprise/prometheus/17.2.2/templates/_helpers.tpl rename to enterprise/prometheus/17.4.2/templates/_helpers.tpl diff --git a/enterprise/prometheus/17.2.2/templates/alertmanager/_alertmanager.tpl b/enterprise/prometheus/17.4.2/templates/alertmanager/_alertmanager.tpl similarity index 100% rename from enterprise/prometheus/17.2.2/templates/alertmanager/_alertmanager.tpl rename to enterprise/prometheus/17.4.2/templates/alertmanager/_alertmanager.tpl diff --git a/enterprise/prometheus/17.2.2/templates/alertmanager/secrets.yaml b/enterprise/prometheus/17.4.2/templates/alertmanager/secrets.yaml similarity index 100% rename from enterprise/prometheus/17.2.2/templates/alertmanager/secrets.yaml rename to enterprise/prometheus/17.4.2/templates/alertmanager/secrets.yaml diff --git a/enterprise/prometheus/17.2.2/templates/alertmanager/serviceaccount.yaml b/enterprise/prometheus/17.4.2/templates/alertmanager/serviceaccount.yaml similarity index 100% rename from enterprise/prometheus/17.2.2/templates/alertmanager/serviceaccount.yaml rename to enterprise/prometheus/17.4.2/templates/alertmanager/serviceaccount.yaml diff --git a/enterprise/prometheus/17.2.2/templates/alertmanager/servicemonitor.yaml b/enterprise/prometheus/17.4.2/templates/alertmanager/servicemonitor.yaml similarity index 100% rename from enterprise/prometheus/17.2.2/templates/alertmanager/servicemonitor.yaml rename to enterprise/prometheus/17.4.2/templates/alertmanager/servicemonitor.yaml diff --git a/enterprise/prometheus/17.2.2/templates/common.yaml b/enterprise/prometheus/17.4.2/templates/common.yaml similarity index 100% rename from enterprise/prometheus/17.2.2/templates/common.yaml rename to enterprise/prometheus/17.4.2/templates/common.yaml diff --git a/enterprise/prometheus/17.2.2/templates/prometheus/_additionalPrometheusRules.tpl b/enterprise/prometheus/17.4.2/templates/prometheus/_additionalPrometheusRules.tpl similarity index 100% rename from enterprise/prometheus/17.2.2/templates/prometheus/_additionalPrometheusRules.tpl rename to enterprise/prometheus/17.4.2/templates/prometheus/_additionalPrometheusRules.tpl diff --git a/enterprise/prometheus/17.2.2/templates/prometheus/_additionalScrapeJobs.tpl b/enterprise/prometheus/17.4.2/templates/prometheus/_additionalScrapeJobs.tpl similarity index 100% rename from enterprise/prometheus/17.2.2/templates/prometheus/_additionalScrapeJobs.tpl rename to enterprise/prometheus/17.4.2/templates/prometheus/_additionalScrapeJobs.tpl diff --git a/enterprise/prometheus/17.2.2/templates/prometheus/_prometheus.tpl b/enterprise/prometheus/17.4.2/templates/prometheus/_prometheus.tpl similarity index 100% rename from enterprise/prometheus/17.2.2/templates/prometheus/_prometheus.tpl rename to enterprise/prometheus/17.4.2/templates/prometheus/_prometheus.tpl diff --git a/enterprise/prometheus/17.2.2/templates/prometheus/_servicemonitor.tpl b/enterprise/prometheus/17.4.2/templates/prometheus/_servicemonitor.tpl similarity index 100% rename from enterprise/prometheus/17.2.2/templates/prometheus/_servicemonitor.tpl rename to enterprise/prometheus/17.4.2/templates/prometheus/_servicemonitor.tpl diff --git a/enterprise/prometheus/17.2.2/templates/prometheus/clusterrole.yaml b/enterprise/prometheus/17.4.2/templates/prometheus/clusterrole.yaml similarity index 100% rename from enterprise/prometheus/17.2.2/templates/prometheus/clusterrole.yaml rename to enterprise/prometheus/17.4.2/templates/prometheus/clusterrole.yaml diff --git a/enterprise/prometheus/17.2.2/templates/prometheus/clusterrolebinding.yaml b/enterprise/prometheus/17.4.2/templates/prometheus/clusterrolebinding.yaml similarity index 100% rename from enterprise/prometheus/17.2.2/templates/prometheus/clusterrolebinding.yaml rename to enterprise/prometheus/17.4.2/templates/prometheus/clusterrolebinding.yaml diff --git a/enterprise/prometheus/17.2.2/templates/prometheus/serviceaccount.yaml b/enterprise/prometheus/17.4.2/templates/prometheus/serviceaccount.yaml similarity index 100% rename from enterprise/prometheus/17.2.2/templates/prometheus/serviceaccount.yaml rename to enterprise/prometheus/17.4.2/templates/prometheus/serviceaccount.yaml diff --git a/enterprise/prometheus/17.2.2/values.yaml b/enterprise/prometheus/17.4.2/values.yaml similarity index 100% rename from enterprise/prometheus/17.2.2/values.yaml rename to enterprise/prometheus/17.4.2/values.yaml diff --git a/stable/gitea/18.3.2/charts/memcached-12.1.4.tgz b/stable/gitea/18.3.2/charts/memcached-12.1.4.tgz index 4111e772a27..0675020a05b 100644 Binary files a/stable/gitea/18.3.2/charts/memcached-12.1.4.tgz and b/stable/gitea/18.3.2/charts/memcached-12.1.4.tgz differ diff --git a/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz b/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz index e2d5ccb1165..c5f88b974eb 100644 Binary files a/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz and b/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz differ