From 6d2f295a4a57e19c9f6694fcb1c5b254df8c87ce Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Tue, 27 Apr 2021 10:34:22 +0200
Subject: [PATCH 1/7] Add: Annotations a8r for Grafana-mixin

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/grafana-mixin/Chart.yaml             |  2 +-
 charts/grafana-mixin/README.md              |  2 +-
 charts/grafana-mixin/templates/_helpers.tpl | 21 +++++++++++++++++++++
 charts/grafana-mixin/templates/alerts.yaml  |  5 +++++
 charts/grafana-mixin/templates/rules.yaml   |  5 +++++
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/charts/grafana-mixin/Chart.yaml b/charts/grafana-mixin/Chart.yaml
index 08b35a53..273a0870 100644
--- a/charts/grafana-mixin/Chart.yaml
+++ b/charts/grafana-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
+version: 0.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/grafana-mixin/README.md b/charts/grafana-mixin/README.md
index bea4706e..be4cc71a 100644
--- a/charts/grafana-mixin/README.md
+++ b/charts/grafana-mixin/README.md
@@ -1,6 +1,6 @@
 # grafana-mixin
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.4.3](https://img.shields.io/badge/AppVersion-7.4.3-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.4.3](https://img.shields.io/badge/AppVersion-7.4.3-informational?style=flat-square)
 
 A Helm chart for Grafana Mixin
 
diff --git a/charts/grafana-mixin/templates/_helpers.tpl b/charts/grafana-mixin/templates/_helpers.tpl
index 2fcc0acc..0fc2ec88 100644
--- a/charts/grafana-mixin/templates/_helpers.tpl
+++ b/charts/grafana-mixin/templates/_helpers.tpl
@@ -54,6 +54,27 @@ app.kubernetes.io/part-of: {{ include "grafana-mixin.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{/* See: https://ambassadorlabs.github.io/k8s-for-humans/ */}}
+{{/*
+Common annotations 
+*/}}
+{{- define "grafana-mixin.annotations" -}}
+a8r.io/description: Monitoring Mixin for Grafana
+a8r.io/owner: portefaix
+a8r.io/bugs: https://github.com/portefaix/portefaix-hub/issues
+a8r.io/documentation: https://artifacthub.io/packages/helm/portefaix-hub/grafana-mixin
+a8r.io/repository: https://github.com/portefaix/portefaix-hub
+a8r.io/support: https://github.com/portefaix/portefaix-hub/issues
+{{- end }}
+
+{{/* a8r.io/logs: */}}
+{{/* a8r.io/runbook: */}}
+{{/* a8r.io/incidents:  */}}
+{{/* a8r.io/uptime */}}
+{{/* a8r.io/performance */}}
+{{/* a8r.io/dependencies */}}
+
+
 {{/*
 Allow the release namespace to be overridden
 */}}
diff --git a/charts/grafana-mixin/templates/alerts.yaml b/charts/grafana-mixin/templates/alerts.yaml
index 908bda98..4f806338 100644
--- a/charts/grafana-mixin/templates/alerts.yaml
+++ b/charts/grafana-mixin/templates/alerts.yaml
@@ -3,6 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "grafana-mixin.fullname" .) "alerts" | trunc 63 | trimSuffix "-" }}
+  annotations:
+{{ include "grafana-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "grafana-mixin.name" . }}
 {{ include "grafana-mixin.labels" . | indent 4 }}
diff --git a/charts/grafana-mixin/templates/rules.yaml b/charts/grafana-mixin/templates/rules.yaml
index 37fecc06..9a8e6343 100644
--- a/charts/grafana-mixin/templates/rules.yaml
+++ b/charts/grafana-mixin/templates/rules.yaml
@@ -3,6 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "grafana-mixin.fullname" .) "rules" | trunc 63 | trimSuffix "-" }}
+  annotations:
+{{ include "grafana-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "grafana-mixin.name" . }}
 {{ include "grafana-mixin.labels" . | indent 4 }}

From 0da61cbe49f52895e300c170fdd7786f640b21f8 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Tue, 27 Apr 2021 10:47:32 +0200
Subject: [PATCH 2/7] Add: Annotations a8r for kube-state-metrics-mixin

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/kube-state-metrics-mixin/Chart.yaml    |  2 +-
 charts/kube-state-metrics-mixin/README.md     |  2 +-
 .../templates/_helpers.tpl                    | 20 +++++++++++++++++++
 .../templates/alerts.yaml                     |  5 +++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/charts/kube-state-metrics-mixin/Chart.yaml b/charts/kube-state-metrics-mixin/Chart.yaml
index f4142719..ce934c03 100644
--- a/charts/kube-state-metrics-mixin/Chart.yaml
+++ b/charts/kube-state-metrics-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
+version: 0.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/kube-state-metrics-mixin/README.md b/charts/kube-state-metrics-mixin/README.md
index b98b7e29..3ff72a10 100644
--- a/charts/kube-state-metrics-mixin/README.md
+++ b/charts/kube-state-metrics-mixin/README.md
@@ -1,6 +1,6 @@
 # kube-state-metrics-mixin
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-rc0](https://img.shields.io/badge/AppVersion-2.0.0--rc0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-rc0](https://img.shields.io/badge/AppVersion-2.0.0--rc0-informational?style=flat-square)
 
 A Helm chart for Kube-State-Metrics Mixin
 
diff --git a/charts/kube-state-metrics-mixin/templates/_helpers.tpl b/charts/kube-state-metrics-mixin/templates/_helpers.tpl
index d2c624ce..32cd7c05 100644
--- a/charts/kube-state-metrics-mixin/templates/_helpers.tpl
+++ b/charts/kube-state-metrics-mixin/templates/_helpers.tpl
@@ -54,6 +54,26 @@ app.kubernetes.io/part-of: {{ include "kube-state-metrics-mixin.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{/* See: https://ambassadorlabs.github.io/k8s-for-humans/ */}}
+{{/*
+Common annotations 
+*/}}
+{{- define "kube-state-metrics-mixin.annotations" -}}
+a8r.io/description: Monitoring Mixin for kube-state-metrics
+a8r.io/owner: portefaix
+a8r.io/bugs: https://github.com/portefaix/portefaix-hub/issues
+a8r.io/documentation: https://artifacthub.io/packages/helm/portefaix-hub/kube-state-metrics-mixin
+a8r.io/repository: https://github.com/portefaix/portefaix-hub
+a8r.io/support: https://github.com/portefaix/portefaix-hub/issues
+{{- end }}
+
+{{/* a8r.io/logs: */}}
+{{/* a8r.io/runbook: */}}
+{{/* a8r.io/incidents:  */}}
+{{/* a8r.io/uptime */}}
+{{/* a8r.io/performance */}}
+{{/* a8r.io/dependencies */}}
+
 {{/*
 Allow the release namespace to be overridden
 */}}
diff --git a/charts/kube-state-metrics-mixin/templates/alerts.yaml b/charts/kube-state-metrics-mixin/templates/alerts.yaml
index dbf1f0b5..967e2205 100644
--- a/charts/kube-state-metrics-mixin/templates/alerts.yaml
+++ b/charts/kube-state-metrics-mixin/templates/alerts.yaml
@@ -3,6 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "kube-state-metrics-mixin.fullname" .) "alerts" | trunc 63 | trimSuffix "-" }}
+  annotations:
+{{ include "kube-state-metrics-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "kube-state-metrics-mixin.name" . }}
 {{ include "kube-state-metrics-mixin.labels" . | indent 4 }}

From 66401161facacb393bb1385e730dc0a36c2b26ec Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Tue, 27 Apr 2021 11:20:45 +0200
Subject: [PATCH 3/7] Add: Annotations a8r for Loki

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/loki-mixin/Chart.yaml             |  2 +-
 charts/loki-mixin/README.md              |  2 +-
 charts/loki-mixin/templates/_helpers.tpl | 20 ++++++++++++++++++++
 charts/loki-mixin/templates/alerts.yaml  |  5 +++++
 charts/loki-mixin/templates/rules.yaml   |  5 +++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/charts/loki-mixin/Chart.yaml b/charts/loki-mixin/Chart.yaml
index 358122ef..3e71f32b 100644
--- a/charts/loki-mixin/Chart.yaml
+++ b/charts/loki-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/loki-mixin/README.md b/charts/loki-mixin/README.md
index f5c5955c..02a401a4 100644
--- a/charts/loki-mixin/README.md
+++ b/charts/loki-mixin/README.md
@@ -1,6 +1,6 @@
 # loki-mixin
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
 
 A Helm chart for loki Mixin
 
diff --git a/charts/loki-mixin/templates/_helpers.tpl b/charts/loki-mixin/templates/_helpers.tpl
index e5bef9cd..98dd4783 100644
--- a/charts/loki-mixin/templates/_helpers.tpl
+++ b/charts/loki-mixin/templates/_helpers.tpl
@@ -54,6 +54,26 @@ app.kubernetes.io/part-of: {{ include "loki-mixin.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{/* See: https://ambassadorlabs.github.io/k8s-for-humans/ */}}
+{{/*
+Common annotations 
+*/}}
+{{- define "loki-mixin.annotations" -}}
+a8r.io/description: Monitoring Mixin for Loki
+a8r.io/owner: portefaix
+a8r.io/bugs: https://github.com/portefaix/portefaix-hub/issues
+a8r.io/documentation: https://artifacthub.io/packages/helm/portefaix-hub/loki-mixin
+a8r.io/repository: https://github.com/portefaix/portefaix-hub
+a8r.io/support: https://github.com/portefaix/portefaix-hub/issues
+{{- end }}
+
+{{/* a8r.io/logs: */}}
+{{/* a8r.io/runbook: */}}
+{{/* a8r.io/incidents:  */}}
+{{/* a8r.io/uptime */}}
+{{/* a8r.io/performance */}}
+{{/* a8r.io/dependencies */}}
+
 {{/*
 Allow the release namespace to be overridden
 */}}
diff --git a/charts/loki-mixin/templates/alerts.yaml b/charts/loki-mixin/templates/alerts.yaml
index 6f17a459..ca7c0465 100644
--- a/charts/loki-mixin/templates/alerts.yaml
+++ b/charts/loki-mixin/templates/alerts.yaml
@@ -3,6 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "loki-mixin.fullname" .) "alerts" | trunc 63 | trimSuffix "-" }}
+  annotations:
+{{ include "loki-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "loki-mixin.name" . }}
 {{ include "loki-mixin.labels" . | indent 4 }}
diff --git a/charts/loki-mixin/templates/rules.yaml b/charts/loki-mixin/templates/rules.yaml
index be598768..e9ea142a 100644
--- a/charts/loki-mixin/templates/rules.yaml
+++ b/charts/loki-mixin/templates/rules.yaml
@@ -3,6 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "loki-mixin.fullname" .) "rules" | trunc 63 | trimSuffix "-" }}
+  annotations:
+{{ include "loki-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "loki-mixin.name" . }}
 {{ include "loki-mixin.labels" . | indent 4 }}

From b8a4ef63672d80e0623f1de5be898b088e596765 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Tue, 27 Apr 2021 11:25:24 +0200
Subject: [PATCH 4/7] Add: Annotations a8r for Prometheus

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/prometheus-mixin/Chart.yaml            |  2 +-
 charts/prometheus-mixin/README.md             |  2 +-
 .../prometheus-mixin/templates/_helpers.tpl   | 20 +++++++++++++++++++
 charts/prometheus-mixin/templates/alerts.yaml |  5 +++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/charts/prometheus-mixin/Chart.yaml b/charts/prometheus-mixin/Chart.yaml
index 955373d8..922a89d4 100644
--- a/charts/prometheus-mixin/Chart.yaml
+++ b/charts/prometheus-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
+version: 0.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/prometheus-mixin/README.md b/charts/prometheus-mixin/README.md
index 4c5a6450..effc6991 100644
--- a/charts/prometheus-mixin/README.md
+++ b/charts/prometheus-mixin/README.md
@@ -1,6 +1,6 @@
 # prometheus-mixin
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.46.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.46.0-informational?style=flat-square)
 
 A Helm chart for Prometheus Mixin
 
diff --git a/charts/prometheus-mixin/templates/_helpers.tpl b/charts/prometheus-mixin/templates/_helpers.tpl
index 01df56e5..c2fa1717 100644
--- a/charts/prometheus-mixin/templates/_helpers.tpl
+++ b/charts/prometheus-mixin/templates/_helpers.tpl
@@ -54,6 +54,26 @@ app.kubernetes.io/part-of: {{ include "prometheus-mixin.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{/* See: https://ambassadorlabs.github.io/k8s-for-humans/ */}}
+{{/*
+Common annotations 
+*/}}
+{{- define "prometheus-mixin.annotations" -}}
+a8r.io/description: Monitoring Mixin for Prometheus
+a8r.io/owner: portefaix
+a8r.io/bugs: https://github.com/portefaix/portefaix-hub/issues
+a8r.io/documentation: https://artifacthub.io/packages/helm/portefaix-hub/prometheus-mixin
+a8r.io/repository: https://github.com/portefaix/portefaix-hub
+a8r.io/support: https://github.com/portefaix/portefaix-hub/issues
+{{- end }}
+
+{{/* a8r.io/logs: */}}
+{{/* a8r.io/runbook: */}}
+{{/* a8r.io/incidents:  */}}
+{{/* a8r.io/uptime */}}
+{{/* a8r.io/performance */}}
+{{/* a8r.io/dependencies */}}
+
 {{/*
 Allow the release namespace to be overridden
 */}}
diff --git a/charts/prometheus-mixin/templates/alerts.yaml b/charts/prometheus-mixin/templates/alerts.yaml
index ba4ef5ba..877cb1c7 100644
--- a/charts/prometheus-mixin/templates/alerts.yaml
+++ b/charts/prometheus-mixin/templates/alerts.yaml
@@ -3,6 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-mixin.fullname" .) "alerts" | trunc 63 | trimSuffix "-" }}
+  annotations:
+{{ include "prometheus-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "prometheus-mixin.name" . }}
 {{ include "prometheus-mixin.labels" . | indent 4 }}

From 00b0210d46e4fe7d2989f9f3883712059f348e9e Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Tue, 27 Apr 2021 11:50:10 +0200
Subject: [PATCH 5/7] Add: Annotations a8r for Promtail

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/promtail-mixin/Chart.yaml             |  2 +-
 charts/promtail-mixin/README.md              |  2 +-
 charts/promtail-mixin/templates/_helpers.tpl | 20 ++++++++++++++++++++
 charts/promtail-mixin/templates/alerts.yaml  |  5 +++++
 charts/promtail-mixin/templates/rules.yaml   |  5 +++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/charts/promtail-mixin/Chart.yaml b/charts/promtail-mixin/Chart.yaml
index d9fc26ab..1dfed6d8 100644
--- a/charts/promtail-mixin/Chart.yaml
+++ b/charts/promtail-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/promtail-mixin/README.md b/charts/promtail-mixin/README.md
index 10999bc5..664fc58c 100644
--- a/charts/promtail-mixin/README.md
+++ b/charts/promtail-mixin/README.md
@@ -1,6 +1,6 @@
 # promtail-mixin
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
 
 A Helm chart for Promtail Mixin
 
diff --git a/charts/promtail-mixin/templates/_helpers.tpl b/charts/promtail-mixin/templates/_helpers.tpl
index b05f00df..91b6b1a6 100644
--- a/charts/promtail-mixin/templates/_helpers.tpl
+++ b/charts/promtail-mixin/templates/_helpers.tpl
@@ -54,6 +54,26 @@ app.kubernetes.io/part-of: {{ include "promtail-mixin.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{/* See: https://ambassadorlabs.github.io/k8s-for-humans/ */}}
+{{/*
+Common annotations 
+*/}}
+{{- define "promtail-mixin.annotations" -}}
+a8r.io/description: Monitoring Mixin for Promtail
+a8r.io/owner: portefaix
+a8r.io/bugs: https://github.com/portefaix/portefaix-hub/issues
+a8r.io/documentation: https://artifacthub.io/packages/helm/portefaix-hub/promtail-mixin
+a8r.io/repository: https://github.com/portefaix/portefaix-hub
+a8r.io/support: https://github.com/portefaix/portefaix-hub/issues
+{{- end }}
+
+{{/* a8r.io/logs: */}}
+{{/* a8r.io/runbook: */}}
+{{/* a8r.io/incidents:  */}}
+{{/* a8r.io/uptime */}}
+{{/* a8r.io/performance */}}
+{{/* a8r.io/dependencies */}}
+
 {{/*
 Allow the release namespace to be overridden
 */}}
diff --git a/charts/promtail-mixin/templates/alerts.yaml b/charts/promtail-mixin/templates/alerts.yaml
index 5e933af6..48736fe1 100644
--- a/charts/promtail-mixin/templates/alerts.yaml
+++ b/charts/promtail-mixin/templates/alerts.yaml
@@ -3,6 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "promtail-mixin.fullname" .) "alerts" | trunc 63 | trimSuffix "-" }}
+  annotations:
+{{ include "promtail-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "promtail-mixin.name" . }}
 {{ include "promtail-mixin.labels" . | indent 4 }}
diff --git a/charts/promtail-mixin/templates/rules.yaml b/charts/promtail-mixin/templates/rules.yaml
index 12e75209..babb93f3 100644
--- a/charts/promtail-mixin/templates/rules.yaml
+++ b/charts/promtail-mixin/templates/rules.yaml
@@ -3,6 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "promtail-mixin.fullname" .) "rules" | trunc 63 | trimSuffix "-" }}
+  annotations:
+{{ include "promtail-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "promtail-mixin.name" . }}
 {{ include "promtail-mixin.labels" . | indent 4 }}

From 583d14849e8231e63b6f6ee8239bb51299b7bba0 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Tue, 27 Apr 2021 11:58:11 +0200
Subject: [PATCH 6/7] Add: Annotations a8r for Prometheus Operator

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/prometheus-operator-mixin/Chart.yaml         |  2 +-
 charts/prometheus-operator-mixin/README.md          |  2 +-
 .../templates/_helpers.tpl                          | 13 +++++++++++++
 .../prometheus-operator-mixin/templates/alerts.yaml |  5 +++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/charts/prometheus-operator-mixin/Chart.yaml b/charts/prometheus-operator-mixin/Chart.yaml
index 6fa0c8c7..07ed057f 100644
--- a/charts/prometheus-operator-mixin/Chart.yaml
+++ b/charts/prometheus-operator-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
+version: 0.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/prometheus-operator-mixin/README.md b/charts/prometheus-operator-mixin/README.md
index 11ede838..92fdc222 100644
--- a/charts/prometheus-operator-mixin/README.md
+++ b/charts/prometheus-operator-mixin/README.md
@@ -1,6 +1,6 @@
 # prometheus-operator-mixin
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.46.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.46.0-informational?style=flat-square)
 
 A Helm chart for Prometheus Operator Mixin
 
diff --git a/charts/prometheus-operator-mixin/templates/_helpers.tpl b/charts/prometheus-operator-mixin/templates/_helpers.tpl
index ad16b2cf..adb306e9 100644
--- a/charts/prometheus-operator-mixin/templates/_helpers.tpl
+++ b/charts/prometheus-operator-mixin/templates/_helpers.tpl
@@ -54,6 +54,19 @@ app.kubernetes.io/part-of: {{ include "prometheus-operator-mixin.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{/* See: https://ambassadorlabs.github.io/k8s-for-humans/ */}}
+{{/*
+Common annotations 
+*/}}
+{{- define "prometheus-operator-mixin.annotations" -}}
+a8r.io/description: Monitoring Mixin for Prometheus Operator
+a8r.io/owner: portefaix
+a8r.io/bugs: https://github.com/portefaix/portefaix-hub/issues
+a8r.io/documentation: https://artifacthub.io/packages/helm/portefaix-hub/prometheus-operator-mixin
+a8r.io/repository: https://github.com/portefaix/portefaix-hub
+a8r.io/support: https://github.com/portefaix/portefaix-hub/issues
+{{- end }}
+
 {{/*
 Allow the release namespace to be overridden
 */}}
diff --git a/charts/prometheus-operator-mixin/templates/alerts.yaml b/charts/prometheus-operator-mixin/templates/alerts.yaml
index d07e239b..32fde5a4 100644
--- a/charts/prometheus-operator-mixin/templates/alerts.yaml
+++ b/charts/prometheus-operator-mixin/templates/alerts.yaml
@@ -3,6 +3,11 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "prometheus-operator-mixin.fullname" .) "alerts" | trunc 63 | trimSuffix "-" }}
+  annotations:
+{{ include "prometheus-operator-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "prometheus-operator-mixin.name" . }}
 {{ include "prometheus-operator-mixin.labels" . | indent 4 }}

From e322e2dd64465223fcc79b0b7504e022cf108262 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Tue, 27 Apr 2021 11:59:38 +0200
Subject: [PATCH 7/7] Add: Annotations a8r for Thanos

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/thanos-mixin/Chart.yaml             |  2 +-
 charts/thanos-mixin/README.md              |  2 +-
 charts/thanos-mixin/templates/_helpers.tpl | 20 ++++++++++++++++++++
 charts/thanos-mixin/templates/alerts.yaml  |  5 +++++
 charts/thanos-mixin/templates/rules.yaml   |  5 +++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/charts/thanos-mixin/Chart.yaml b/charts/thanos-mixin/Chart.yaml
index bd8a4a4e..05568da8 100644
--- a/charts/thanos-mixin/Chart.yaml
+++ b/charts/thanos-mixin/Chart.yaml
@@ -28,7 +28,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.10.0
+version: 0.11.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/thanos-mixin/README.md b/charts/thanos-mixin/README.md
index c013c126..49d5cfdb 100644
--- a/charts/thanos-mixin/README.md
+++ b/charts/thanos-mixin/README.md
@@ -1,6 +1,6 @@
 # thanos-mixin
 
-![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.18.0](https://img.shields.io/badge/AppVersion-0.18.0-informational?style=flat-square)
+![Version: 0.11.0](https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.18.0](https://img.shields.io/badge/AppVersion-0.18.0-informational?style=flat-square)
 
 A Helm chart for Thanos Mixin
 
diff --git a/charts/thanos-mixin/templates/_helpers.tpl b/charts/thanos-mixin/templates/_helpers.tpl
index 42a26b32..544fb2d8 100644
--- a/charts/thanos-mixin/templates/_helpers.tpl
+++ b/charts/thanos-mixin/templates/_helpers.tpl
@@ -54,6 +54,26 @@ app.kubernetes.io/part-of: {{ include "thanos-mixin.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{/* See: https://ambassadorlabs.github.io/k8s-for-humans/ */}}
+{{/*
+Common annotations 
+*/}}
+{{- define "thanos-mixin.annotations" -}}
+a8r.io/description: Monitoring Mixin for Thanos
+a8r.io/owner: portefaix
+a8r.io/bugs: https://github.com/portefaix/portefaix-hub/issues
+a8r.io/documentation: https://artifacthub.io/packages/helm/portefaix-hub/thanos-mixin
+a8r.io/repository: https://github.com/portefaix/portefaix-hub
+a8r.io/support: https://github.com/portefaix/portefaix-hub/issues
+{{- end }}
+
+{{/* a8r.io/logs: */}}
+{{/* a8r.io/runbook: */}}
+{{/* a8r.io/incidents:  */}}
+{{/* a8r.io/uptime */}}
+{{/* a8r.io/performance */}}
+{{/* a8r.io/dependencies */}}
+
 {{/*
 Allow the release namespace to be overridden
 */}}
diff --git a/charts/thanos-mixin/templates/alerts.yaml b/charts/thanos-mixin/templates/alerts.yaml
index d4fb354b..3482484e 100644
--- a/charts/thanos-mixin/templates/alerts.yaml
+++ b/charts/thanos-mixin/templates/alerts.yaml
@@ -4,6 +4,11 @@ kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "thanos-mixin.fullname" .) "alerts" | trunc 63 | trimSuffix "-" }}
   namespace: {{ include "thanos-mixin.namespace" . }}
+  annotations:
+{{ include "thanos-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "thanos-mixin.name" . }}
 {{ include "thanos-mixin.labels" . | indent 4 }}
diff --git a/charts/thanos-mixin/templates/rules.yaml b/charts/thanos-mixin/templates/rules.yaml
index cb83d6af..e9273997 100644
--- a/charts/thanos-mixin/templates/rules.yaml
+++ b/charts/thanos-mixin/templates/rules.yaml
@@ -4,6 +4,11 @@ kind: PrometheusRule
 metadata:
   name: {{ printf "%s-%s" (include "thanos-mixin.fullname" .) "rules" | trunc 63 | trimSuffix "-" }}-rules
   namespace: {{ include "thanos-mixin.namespace" . }}
+  annotations:
+{{ include "thanos-mixin.annotations" . | indent 4 }}
+{{- if .Values.additionalAnnotations }}
+{{ toYaml .Values.additionalAnnotations | indent 4 }}
+{{- end }}
   labels:
     app: {{ include "thanos-mixin.name" . }}
 {{ include "thanos-mixin.labels" . | indent 4 }}