Skip to content

Commit 136f29d

Browse files
authored
fix prometheus installation (#6931)
1 parent 14cd2be commit 136f29d

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
seldon_monitoring_namespace: "seldon-monitoring"
3-
seldon_monitoring_prometheus_operator_values: "{{ lookup('file', 'prometheus-operator-values.yaml') | from_yaml }}"
3+
seldon_monitoring_prometheus_operator_values: "{{ lookup('ansible.builtin.template', '../templates/prometheus-operator-values.yaml.j2') | from_yaml }}"
44
seldon_monitoring_prometheus_adapter_values: "{{ lookup('file', 'prometheus-adapter-values.yaml') | from_yaml }}"
5-
seldon_monitoring_prometheus_operator_chart_version: "10.0.4"
5+
seldon_monitoring_prometheus_operator_chart_version: "66.2.1"
66
seldon_monitoring_prometheus_adapter_chart_version: "4.11.0"
77

88
seldon_prometheus_adapter_config_rate: "5m"

ansible/roles/prometheus/files/prometheus-operator-values.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

ansible/roles/prometheus/tasks/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
kubernetes.core.helm:
1111
name: seldon-monitoring
1212
release_namespace: "{{ seldon_monitoring_namespace }}"
13-
chart_repo_url: "https://charts.bitnami.com/bitnami"
14-
chart_ref: "kube-prometheus"
13+
chart_repo_url: "https://prometheus-community.github.io/helm-charts/"
14+
chart_ref: "kube-prometheus-stack"
1515
chart_version: "{{ seldon_monitoring_prometheus_operator_chart_version }}"
1616
values: "{{ seldon_monitoring_prometheus_operator_values }}"
1717

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
fullnameOverride: seldon-monitoring
2+
grafana:
3+
enabled: false
4+
kubeEtcd:
5+
enabled: false
6+
prometheus:
7+
prometheusSpec:
8+
podMonitorNamespaceSelector:
9+
matchNamespaces:
10+
- {{ seldon_mesh_namespace }}
11+
podMonitorSelector: # accept all PodMonitors
12+
podMonitorSelectorNilUsesHelmValues: false
13+
serviceMonitorNamespaceSelector:
14+
matchNames:
15+
- {{ seldon_mesh_namespace }}
16+
serviceMonitorSelector: # accept all ServiceMonitors
17+
serviceMonitorSelectorNilUsesHelmValues: false
18+
maximumStartupDurationSeconds: 300

0 commit comments

Comments
 (0)