diff --git a/prometheus-alertmanager/Chart.yaml b/prometheus-alertmanager/Chart.yaml index 41d44776a..365994f0b 100644 --- a/prometheus-alertmanager/Chart.yaml +++ b/prometheus-alertmanager/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v0.20.0 description: OpenStack-Helm Alertmanager for Prometheus name: prometheus-alertmanager -version: 0.1.4 +version: 0.1.5 home: https://prometheus.io/docs/alerting/alertmanager/ sources: - https://github.com/prometheus/alertmanager diff --git a/prometheus-alertmanager/templates/service.yaml b/prometheus-alertmanager/templates/service.yaml index aa08fa0c6..03c50b912 100644 --- a/prometheus-alertmanager/templates/service.yaml +++ b/prometheus-alertmanager/templates/service.yaml @@ -14,11 +14,16 @@ limitations under the License. {{- if .Values.manifests.service }} {{- $envAll := . }} +{{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.prometheus }} --- apiVersion: v1 kind: Service metadata: name: {{ tuple "alertmanager" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} + annotations: +{{- if .Values.monitoring.prometheus.enabled }} +{{ tuple $prometheus_annotations | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }} +{{- end }} spec: ports: - name: http diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml index 333e90cc7..9d690effc 100644 --- a/prometheus-alertmanager/values.yaml +++ b/prometheus-alertmanager/values.yaml @@ -243,6 +243,12 @@ network_policy: egress: - {} +monitoring: + prometheus: + enabled: true + prometheus: + scrape: true + conf: httpd: | ServerRoot "/usr/local/apache2"