From ae5e2b23dd93045e8b162b0c90180c3056313b82 Mon Sep 17 00:00:00 2001
From: j_r0dd <285797+jr0dd@users.noreply.github.com>
Date: Sun, 12 Sep 2021 16:42:13 -0400
Subject: [PATCH] [adguard-home] remove useless prometheus references (#1175)

---
 charts/stable/adguard-home/Chart.yaml         |  2 +-
 .../adguard-home/README_CHANGELOG.md.gotmpl   |  7 +++++++
 .../templates/servicemonitor.yaml             | 21 -------------------
 charts/stable/adguard-home/values.yaml        | 12 -----------
 4 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 charts/stable/adguard-home/templates/servicemonitor.yaml

diff --git a/charts/stable/adguard-home/Chart.yaml b/charts/stable/adguard-home/Chart.yaml
index 5af809f5..3e1ba377 100644
--- a/charts/stable/adguard-home/Chart.yaml
+++ b/charts/stable/adguard-home/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.106.3
 description: DNS proxy as ad-blocker for local network
 name: adguard-home
-version: 5.0.1
+version: 5.0.2
 kubeVersion: ">=1.16.0-0"
 keywords:
 - adguard-home
diff --git a/charts/stable/adguard-home/README_CHANGELOG.md.gotmpl b/charts/stable/adguard-home/README_CHANGELOG.md.gotmpl
index 1c15172b..ed368983 100644
--- a/charts/stable/adguard-home/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/adguard-home/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,12 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [5.1.0]
+
+#### Removed
+
+- Removed serviceMonitor since AdguardHome doesn't have prometheus metrics. An exporter would be needed instead.
+
 ### [5.0.1]
 
 #### Changed
@@ -55,6 +61,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
+[5.1.0]: #510
 [5.0.1]: #501
 [5.0.0]: #500
 [4.0.1]: #401
diff --git a/charts/stable/adguard-home/templates/servicemonitor.yaml b/charts/stable/adguard-home/templates/servicemonitor.yaml
deleted file mode 100644
index 4cd9bce7..00000000
--- a/charts/stable/adguard-home/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- if .Values.prometheus.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "common.names.fullname" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-    {{- with .Values.prometheus.serviceMonitor.additionalLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
-  endpoints:
-  - port: http
-    {{- with .Values.prometheus.serviceMonitor.interval }}
-    interval: {{ . }}
-    {{- end }}
-    path: /
-{{- end }}
diff --git a/charts/stable/adguard-home/values.yaml b/charts/stable/adguard-home/values.yaml
index 9d35882d..507e1eb8 100644
--- a/charts/stable/adguard-home/values.yaml
+++ b/charts/stable/adguard-home/values.yaml
@@ -94,18 +94,6 @@ persistence:
     enabled: false
     mountPath: /opt/adguardhome/work
 
-prometheus:
-  # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
-  # @default -- See values.yaml
-  serviceMonitor:
-    enabled: false
-    interval: 30s
-    additionalLabels: {}
-
-# podAnnotations:
-#   prometheus.io/scrape: "true"
-#   prometheus.io/port: "api"
-
 # config -- AdGuard Home configuration. For a full list of options see https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration.
 # @default -- See values.yaml
 config: |