diff --git a/jsonnet/kube-prometheus/components/alertmanager.libsonnet b/jsonnet/kube-prometheus/components/alertmanager.libsonnet index bda39ec4c7747ed516b7ea3abb9380b6f4c8f683..910ff7b91f76e913f5cf8e6b620f31c58d3de33b 100644 --- a/jsonnet/kube-prometheus/components/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/components/alertmanager.libsonnet @@ -19,6 +19,7 @@ local defaults = { if !std.setMember(labelName, ['app.kubernetes.io/version']) }, name: error 'must provide name', + reloaderPort: 8080, config: { global: { resolve_timeout: '5m', @@ -136,6 +137,7 @@ function(params) { spec: { ports: [ { name: 'web', targetPort: 'web', port: 9093 }, + { name: 'reloader-web', port: am._config.reloaderPort, targetPort: 'reloader-web' }, ], selector: { app: 'alertmanager', @@ -161,6 +163,7 @@ function(params) { }, endpoints: [ { port: 'web', interval: '30s' }, + { port: 'reloader-web', interval: '30s' }, ], }, }, diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index 2df12b96100c861707e01829ba8d50cbcca81d89..27367963447e4533b29663759af9cd1811f86ba3 100644 --- a/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -35,6 +35,7 @@ local defaults = { }, }, thanos: null, + reloaderPort: 8080, }; @@ -98,6 +99,7 @@ function(params) { spec: { ports: [ { name: 'web', targetPort: 'web', port: 9090 }, + { name: 'reloader-web', port: p._config.reloaderPort, targetPort: 'reloader-web' }, ] + ( if p._config.thanos != null then @@ -317,10 +319,10 @@ function(params) { selector: { matchLabels: p._config.selectorLabels, }, - endpoints: [{ - port: 'web', - interval: '30s', - }], + endpoints: [ + { port: 'web', interval: '30s' }, + { port: 'reloader-web', interval: '30s' }, + ], }, }, diff --git a/manifests/alertmanager-service.yaml b/manifests/alertmanager-service.yaml index f3f6cf719cf900dbbc2affd1a4db6ea6b7c6654d..473e050c950d23bedbd22185a4287eb8836edfd0 100644 --- a/manifests/alertmanager-service.yaml +++ b/manifests/alertmanager-service.yaml @@ -14,6 +14,9 @@ spec: - name: web port: 9093 targetPort: web + - name: reloader-web + port: 8080 + targetPort: reloader-web selector: alertmanager: main app: alertmanager diff --git a/manifests/alertmanager-serviceMonitor.yaml b/manifests/alertmanager-serviceMonitor.yaml index 070ef530252d52daf58a62eda46bb1a8116363a8..8d3ca18f6db62d34b90ffedded31a39c5d968dd0 100644 --- a/manifests/alertmanager-serviceMonitor.yaml +++ b/manifests/alertmanager-serviceMonitor.yaml @@ -12,6 +12,8 @@ spec: endpoints: - interval: 30s port: web + - interval: 30s + port: reloader-web selector: matchLabels: alertmanager: main diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml index ff1297e75e2acaea57952784021123d9c896b662..72f099b94bd423337ee5a27984d221c076b50527 100644 --- a/manifests/prometheus-service.yaml +++ b/manifests/prometheus-service.yaml @@ -14,6 +14,9 @@ spec: - name: web port: 9090 targetPort: web + - name: reloader-web + port: 8080 + targetPort: reloader-web selector: app: prometheus app.kubernetes.io/component: prometheus diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml index eb80c2796f15fefa05407dba6556422650f24a44..a34bedac6cd608b903b60ccfefe11c067b24f628 100644 --- a/manifests/prometheus-serviceMonitor.yaml +++ b/manifests/prometheus-serviceMonitor.yaml @@ -12,6 +12,8 @@ spec: endpoints: - interval: 30s port: web + - interval: 30s + port: reloader-web selector: matchLabels: app.kubernetes.io/component: prometheus