Add PrometheusRule and ServiceMonitor to common (#47)

* Add PrometheusRule and ServiceMonitor to common

* Bump Kind version

.github/workflows/lint-test.yaml

@@ -21,7 +21,7 @@ jobs:
           python-version: 3.7
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.2.1
+        uses: helm/chart-testing-action@v2.3.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -37,7 +37,7 @@ jobs:
       - name: Create k3d cluster
         uses: nolar/setup-k3d-k3s@v1
         with:
-          version: v1.19
+          version: v1.23
         if: steps.list-changed.outputs.changed == 'true'
 
       - name: Remove node taints

.github/workflows/release.yaml

@@ -25,7 +25,7 @@ jobs:
           version: v3.4.0
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.4.0
+        uses: helm/chart-releaser-action@v1.4.1
         with:
           charts_repo_url: https://nikdoof.github.io/helm-charts
         env:

charts/aaisp-exporter/Chart.yaml

@@ -2,17 +2,17 @@ apiVersion: v2
 appVersion: 0.2.1
 description: A prometheus exporter for the Andrew & Arnold CHAOS API
 name: aaisp-exporter
-version: 0.2.0
+version: 0.2.2
 kubeVersion: ">=1.16.0-0"
 keywords:
-- aaisp-exporter
+  - aaisp-exporter
 home: https://github.com/nikdoof/helm-charts/tree/master/charts/aaisp-exporter
 sources:
-- https://github.com/nikdoof/aaisp-chaos
+  - https://github.com/nikdoof/aaisp-chaos
 maintainers:
-- name: nikdoof
-  email: andy@tensixtyone.com
+  - name: nikdoof
+    email: andy@tensixtyone.com
 dependencies:
-- name: common
-  repository: https://library-charts.k8s-at-home.com
-  version: 4.3.0
+  - name: common
+    repository: https://nikdoof.github.io/helm-charts/
+    version: 4.5.2

charts/aaisp-exporter/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

charts/aaisp-exporter/templates/servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.metrics.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/aaisp2mqtt/.helmignore

@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

charts/aaisp2mqtt/Chart.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-appVersion: "0.3.1"
-description: Pulls data from the AAISP CHAOSv2 API into MQTT
-name: aaisp2mqtt
-version: 0.3.3
-keywords:
-  - aaisp
-  - mqtt
-home: https://github.com/nikdoof/aaisp2mqtt
-sources:
-  - https://hub.docker.com/r/nikdoof/aaisp2mqtt/
-  - https://github.com/natm/aaisp2mqtt
-maintainers:
-  - name: nikdoof
-    email: andy@tensixtyone.com

charts/aaisp2mqtt/README.md

@@ -1,44 +0,0 @@
-# aaisp2mqtt
-
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
-
-Pulls data from the AAISP CHAOSv2 API into MQTT
-
-**Homepage:** <https://github.com/nikdoof/aaisp2mqtt>
-
-## Maintainers
-
-| Name | Email | Url |
-| ---- | ------ | --- |
-| nikdoof | andy@tensixtyone.com |  |
-
-## Source Code
-
-* <https://hub.docker.com/r/nikdoof/aaisp2mqtt/>
-* <https://github.com/natm/aaisp2mqtt>
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| aaisp | object | `{}` |  |
-| affinity | object | `{}` |  |
-| cronjob.concurrencyPolicy | string | `"Allow"` |  |
-| cronjob.failedJobsHistoryLimit | int | `1` |  |
-| cronjob.schedule | string | `"*/10 * * * *"` |  |
-| cronjob.successfulJobsHistoryLimit | int | `3` |  |
-| fullnameOverride | string | `""` |  |
-| homeassistant.enabled | bool | `false` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"nikdoof/aaisp2mqtt"` |  |
-| image.tag | string | `"0.3.1"` |  |
-| mqtt.authenticated | bool | `false` |  |
-| mqtt.port | int | `1883` |  |
-| nameOverride | string | `""` |  |
-| nodeSelector | object | `{}` |  |
-| replicaCount | int | `1` |  |
-| resources | object | `{}` |  |
-| tolerations | list | `[]` |  |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

charts/aaisp2mqtt/ci/existingsecret-values.yaml

@@ -1,4 +0,0 @@
-mqtt:
-  broker: localhost
-
-existingSecretName: aaisp2mqtt-secret

charts/aaisp2mqtt/ci/homeassistant-values.yaml

@@ -1,9 +0,0 @@
-aaisp:
-  username: test1@a
-  password: TesttestTest
-
-mqtt:
-  broker: localhost
-
-homeassistant:
-  enabled: true

charts/aaisp2mqtt/ci/test-values.yaml

@@ -1,6 +0,0 @@
-aaisp:
-  username: test1@a
-  password: TesttestTest
-
-mqtt:
-  broker: localhost

charts/aaisp2mqtt/templates/_helpers.tpl

@@ -1,56 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "aaisp2mqtt.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "aaisp2mqtt.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "aaisp2mqtt.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "aaisp2mqtt.labels" -}}
-app.kubernetes.io/name: {{ include "aaisp2mqtt.name" . }}
-helm.sh/chart: {{ include "aaisp2mqtt.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "aaisp2mqtt.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "aaisp2mqtt.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

charts/aaisp2mqtt/templates/cronjob.yaml

@@ -1,97 +0,0 @@
----
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: {{ include "aaisp2mqtt.fullname" . }}-cronjob
-  {{- if .Values.deploymentAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.deploymentAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "aaisp2mqtt.name" . }}
-    helm.sh/chart: {{ include "aaisp2mqtt.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ include "aaisp2mqtt.name" . }}
-spec:
-  schedule: {{ .Values.cronjob.schedule | quote }}
-  successfulJobsHistoryLimit: {{ .Values.cronjob.successfulJobsHistoryLimit }}
-  failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}
-  concurrencyPolicy: {{ .Values.cronjob.concurrencyPolicy }}
-  {{- if .Values.cronjob.startingDeadlineSeconds }}
-  startingDeadlineSeconds: {{ .Values.cronjob.startingDeadlineSeconds }}
-  {{- end }}
-  jobTemplate:
-    spec:
-      backoffLimit: 0
-      template:
-        metadata:
-          labels:
-            app.kubernetes.io/name: {{ include "aaisp2mqtt.name" . }}
-            helm.sh/chart: {{ include "aaisp2mqtt.chart" . }}
-            app.kubernetes.io/instance: {{ .Release.Name }}
-            app.kubernetes.io/managed-by: {{ include "aaisp2mqtt.name" . }}
-        spec:
-          restartPolicy: Never
-          {{- if .Values.image.pullSecrets }}
-          imagePullSecrets:
-          {{- range .Values.image.pullSecrets }}
-            - name: {{ . }}
-          {{- end }}
-          {{- end }}
-          containers:
-          - name: {{ .Chart.Name }}
-            image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-            imagePullPolicy: {{ .Values.image.pullPolicy }}
-            resources:
-{{ toYaml .Values.resources | indent 16 }}
-            env:
-              - name: AAISP_USERNAME
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "aaisp2mqtt-secret" .Values.existingSecretName }}
-                    key: aaisp.username
-              - name: AAISP_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "aaisp2mqtt-secret" .Values.existingSecretName }}
-                    key: aaisp.password
-              - name: MQTT_BROKER
-                value: {{ .Values.mqtt.broker }}
-              - name: MQTT_PORT
-                value: "{{ default 1883 .Values.mqtt.port }}"
-            {{- if .Values.mqtt.authenticated }}
-              - name: MQTT_USERNAME
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "aaisp2mqtt-secret" .Values.existingSecretName }}
-                    key: mqtt.username
-              - name: MQTT_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "aaisp2mqtt-secret" .Values.existingSecretName }}
-                    key: mqtt.password
-            {{- end }}
-              - name: MQTT_TOPIC_PREFIX
-                value: {{ default "aaisp" .Values.mqtt.topicPrefix }}
-            {{- if .Values.homeassistant.enabled }}
-              - name: HOMEASSISTANT_ENABLED
-                value: '{{ .Values.homeassistant.enabled }}'
-              {{- if .Values.homeassistant.discoveryPrefix }}
-              - name: HOMEASSISTANT_DISCOVERY_PREFIX
-                value: {{ .Values.homeassistant.discoveryPrefix }}
-              {{- end }}
-            {{- end }}
-    {{- with .Values.nodeSelector }}
-          nodeSelector:
-{{ toYaml . | indent 12 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-          affinity:
-{{ toYaml . | indent 12 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-          tolerations:
-{{ toYaml . | indent 12 }}:
-    {{- end }}

charts/aaisp2mqtt/templates/secrets.yaml

@@ -1,20 +0,0 @@
----
-{{- if not (.Values.existingSecretName) }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: aaisp2mqtt-secret
-  labels:
-    app.kubernetes.io/name: {{ include "aaisp2mqtt.name" . }}
-    helm.sh/chart: {{ include "aaisp2mqtt.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ include "aaisp2mqtt.name" . }}
-type: Opaque
-data:
-  aaisp.username: {{ .Values.aaisp.username | b64enc }}
-  aaisp.password: {{ .Values.aaisp.password | b64enc }}
-  {{- if .Values.mqtt.authenticated }}
-  mqtt.username: {{ .Values.mqtt.username | b64enc }}
-  mqtt.password: {{ .Values.mqtt.password | b64enc }}
-  {{- end }}
-{{- end }}

charts/aaisp2mqtt/values.yaml

@@ -1,61 +0,0 @@
-# Default values for aaisp2mqtt.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: nikdoof/aaisp2mqtt
-  tag: 0.3.1
-  pullPolicy: IfNotPresent
-  # imagePullSecrets: []
-
-nameOverride: ""
-fullnameOverride: ""
-
-## Use a pre-existing secret for login information
-##
-# existingSecretName: existing-secret
-
-## Connection details
-##
-aaisp: {}
-  # username: user1@a
-  # password: password
-
-mqtt:
-  # broker: localhost
-  port: 1883
-  authenticated: false
-  # username: kube
-  # password: kube
-  # topicPrefix: aaisp
-
-homeassistant:
-  enabled: false
-  # discoveryPrefix: homeassistant
-
-cronjob:
-  schedule: "*/10 * * * *"
-  successfulJobsHistoryLimit: 3
-  failedJobsHistoryLimit: 1
-  # startingDeadlineSeconds: 10
-  concurrencyPolicy: Allow
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}

charts/antennas/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "4.2.0"
 description: Antennas
 name: antennas
-version: 1.1.2
+version: 1.1.3
 kubeVersion: ">=1.16.0-0"
 keywords:
   - tvheadend
@@ -17,5 +17,5 @@ maintainers:
     email: andy@tensixtyone.com
 dependencies:
   - name: common
-    repository: https://library-charts.k8s-at-home.com
+    repository: https://nikdoof.github.io/helm-charts/
     version: 4.5.2

charts/common/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: Common chart library, based off KaH's common
 type: library
-version: 4.5.2
+version: 4.5.3
 kubeVersion: ">=1.16.0-0"
 keywords:
   - common

charts/common/templates/_all.tpl

@@ -55,4 +55,12 @@ Main entrypoint for the common library chart. It will render all underlying temp
   {{- if .Values.secret -}}
     {{ include "common.secret" .  | nindent 0 }}
   {{- end -}}
+
+  {{- if .Values.metrics.enabled -}}
+    {{ include "common.serviceMonitor" .  | nindent 0 }}
+  {{- end -}}
+
+  {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled -}}
+    {{ include "common.prometheusRule" .  | nindent 0 }}
+  {{- end -}}
 {{- end -}}

charts/common/templates/_prometheusrule.tpl

@@ -0,0 +1,19 @@
+{{- define "common.prometheusRule" }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/common/templates/_servicemonitor.tpl

@@ -0,0 +1,25 @@
+{{- define "common.serviceMonitor" }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  endpoints:
+    - port: metrics
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      path: /metrics
+{{- end }}

charts/common/values.yaml

@@ -472,6 +472,32 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
+metrics:
+  # -- Enable metrics collections with serviceMonitor
+  # @default -- See values.yaml
+  enabled: false
+  serviceMonitor:
+    interval: 3m
+    scrapeTimeout: 1m
+    labels: {}
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: SonarrDown
+      #   annotations:
+      #     description: Sonarr service is down.
+      #     summary: Sonarr is down.
+      #   expr: |
+      #     sonarr_system_status == 0
+      #   for: 5m
+      #   labels:
+      #     severity: critical
+
 # -- The common chart supports several add-ons. These can be configured under this key.
 # @default -- See below
 addons:

charts/hg612-exporter/Chart.yaml

@@ -2,17 +2,17 @@ apiVersion: v2
 appVersion: 0.1.2
 description: A prometheus exporter for the HG612 modem
 name: hg612-exporter
-version: 1.2.0
+version: 1.2.2
 kubeVersion: ">=1.16.0-0"
 keywords:
-- hg612-exporter
+  - hg612-exporter
 home: https://github.com/nikdoof/helm-charts/tree/master/charts/hg612-exporter
 sources:
-- https://github.com/nikdoof/hg612-exporter
+  - https://github.com/nikdoof/hg612-exporter
 maintainers:
-- name: nikdoof
-  email: andy@tensixtyone.com
+  - name: nikdoof
+    email: andy@tensixtyone.com
 dependencies:
-- name: common
-  repository: https://library-charts.k8s-at-home.com
-  version: 4.3.0
+  - name: common
+    repository: https://nikdoof.github.io/helm-charts/
+    version: 4.5.2

charts/hg612-exporter/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

charts/hg612-exporter/templates/servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.metrics.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/idrac6/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.5.0"
 description: iDRAC 6 web interface and VNC proxy
 name: idrac6
-version: 1.1.0
+version: 1.1.1
 kubeVersion: ">=1.16.0-0"
 keywords:
   - idrac6
@@ -14,5 +14,5 @@ maintainers:
     email: andy@tensixtyone.com
 dependencies:
   - name: common
-    repository: https://library-charts.k8s-at-home.com
-    version: 4.3.0
+    repository: https://nikdoof.github.io/helm-charts/
+    version: 4.5.2

charts/mqtt-exporter/Chart.yaml

@@ -2,17 +2,17 @@ apiVersion: v2
 appVersion: 1.0.0
 description: A prometheus exporter for generic MQTT metrics
 name: mqtt-exporter
-version: 1.1.0
+version: 1.1.2
 kubeVersion: ">=1.16.0-0"
 keywords:
-- mqtt-exporter
+  - mqtt-exporter
 home: https://github.com/nikdoof/helm-charts/tree/master/charts/mqtt-exporter
 sources:
-- https://github.com/kpetremann/mqtt-exporter
+  - https://github.com/kpetremann/mqtt-exporter
 maintainers:
-- name: nikdoof
-  email: andy@tensixtyone.com
+  - name: nikdoof
+    email: andy@tensixtyone.com
 dependencies:
-- name: common
-  repository: https://library-charts.k8s-at-home.com
-  version: 4.3.0
+  - name: common
+    repository: https://nikdoof.github.io/helm-charts/
+    version: 4.5.2

charts/mqtt-exporter/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

charts/mqtt-exporter/templates/servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.metrics.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/plex-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.2.2
 description: A prometheus exporter for Plex Media Server
 name: plex-exporter
-version: 0.1.0
+version: 0.1.2
 kubeVersion: ">=1.16.0-0"
 keywords:
   - plex-exporter
@@ -15,5 +15,6 @@ maintainers:
     email: andy@tensixtyone.com
 dependencies:
   - name: common
-    repository: https://library-charts.k8s-at-home.com
-    version: 4.3.0
+    repository: https://nikdoof.github.io/helm-charts/
+    version: 4.5.2
+

charts/plex-exporter/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

charts/plex-exporter/templates/servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.metrics.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/vmware-exporter/Chart.yaml

@@ -2,18 +2,18 @@ apiVersion: v2
 appVersion: 0.18.2
 description: A prometheus exporter for vSphere vCenter
 name: vmware-exporter
-version: 0.2.0
+version: 0.2.2
 kubeVersion: ">=1.16.0-0"
 keywords:
-- vmware-exporter
+  - vmware-exporter
 home: https://github.com/nikdoof/helm-charts/tree/master/charts/vmware-exporter
 sources:
-- https://github.com/pryorda/vmware_exporter
-- https://hub.docker.com/r/pryorda/vmware_exporter/tags
+  - https://github.com/pryorda/vmware_exporter
+  - https://hub.docker.com/r/pryorda/vmware_exporter/tags
 maintainers:
-- name: nikdoof
-  email: andy@tensixtyone.com
+  - name: nikdoof
+    email: andy@tensixtyone.com
 dependencies:
-- name: common
-  repository: https://library-charts.k8s-at-home.com
-  version: 4.3.0
+  - name: common
+    repository: https://nikdoof.github.io/helm-charts/
+    version: 4.5.2

charts/vmware-exporter/templates/prometheusrules.yaml

@@ -1,4 +1,5 @@
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

charts/vmware-exporter/templates/servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.metrics.enabled }}
+{{- include "common.values.setup" . -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/vsphere-influxdb-go/.helmignore

@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

charts/vsphere-influxdb-go/Chart.yaml

@@ -1,16 +0,0 @@
-apiVersion: v1
-appVersion: "0.8.5"
-description: Collect VMware vCenter and ESXi performance metrics and send them to InfluxDB
-name: vsphere-influxdb-go
-version: 0.2.3
-keywords:
-  - vsphere
-  - influxdb
-  - esx
-home: https://github.com/Oxalide/vsphere-influxdb-go
-sources:
-  - https://hub.docker.com/r/nikdoof/vsphere-influxdb-go/
-  - https://github.com/janeczku/calibre-web
-maintainers:
-  - name: nikdoof
-    email: andy@tensixtyone.com

charts/vsphere-influxdb-go/README.md

@@ -1,129 +0,0 @@
-# vsphere-influxdb-go
-
-![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![AppVersion: 0.8.5](https://img.shields.io/badge/AppVersion-0.8.5-informational?style=flat-square)
-
-Collect VMware vCenter and ESXi performance metrics and send them to InfluxDB
-
-**Homepage:** <https://github.com/Oxalide/vsphere-influxdb-go>
-
-## Maintainers
-
-| Name | Email | Url |
-| ---- | ------ | --- |
-| nikdoof | andy@tensixtyone.com |  |
-
-## Source Code
-
-* <https://hub.docker.com/r/nikdoof/vsphere-influxdb-go/>
-* <https://github.com/janeczku/calibre-web>
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{}` |  |
-| config.Domain | string | `""` |  |
-| config.InfluxDB | list | `[]` |  |
-| config.Interval | int | `60` |  |
-| config.Metrics[0].Definition[0].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[0].Metric | string | `"cpu.usage.average"` |  |
-| config.Metrics[0].Definition[10].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[10].Metric | string | `"mem.consumed.maximum"` |  |
-| config.Metrics[0].Definition[11].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[11].Metric | string | `"mem.active.average"` |  |
-| config.Metrics[0].Definition[12].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[12].Metric | string | `"mem.active.maximum"` |  |
-| config.Metrics[0].Definition[13].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[13].Metric | string | `"mem.vmmemctl.average"` |  |
-| config.Metrics[0].Definition[14].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[14].Metric | string | `"mem.vmmemctl.maximum"` |  |
-| config.Metrics[0].Definition[15].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[15].Metric | string | `"mem.totalCapacity.average"` |  |
-| config.Metrics[0].Definition[16].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[16].Metric | string | `"net.packetsRx.summation"` |  |
-| config.Metrics[0].Definition[17].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[17].Metric | string | `"net.packetsTx.summation"` |  |
-| config.Metrics[0].Definition[18].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[18].Metric | string | `"net.throughput.usage.average"` |  |
-| config.Metrics[0].Definition[19].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[19].Metric | string | `"net.received.average"` |  |
-| config.Metrics[0].Definition[1].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[1].Metric | string | `"cpu.usage.maximum"` |  |
-| config.Metrics[0].Definition[20].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[20].Metric | string | `"net.transmitted.average"` |  |
-| config.Metrics[0].Definition[21].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[21].Metric | string | `"net.throughput.usage.nfs.average"` |  |
-| config.Metrics[0].Definition[22].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[22].Metric | string | `"datastore.numberReadAveraged.average"` |  |
-| config.Metrics[0].Definition[23].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[23].Metric | string | `"datastore.numberWriteAveraged.average"` |  |
-| config.Metrics[0].Definition[24].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[24].Metric | string | `"datastore.read.average"` |  |
-| config.Metrics[0].Definition[25].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[25].Metric | string | `"datastore.write.average"` |  |
-| config.Metrics[0].Definition[26].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[26].Metric | string | `"datastore.totalReadLatency.average"` |  |
-| config.Metrics[0].Definition[27].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[27].Metric | string | `"datastore.totalWriteLatency.average"` |  |
-| config.Metrics[0].Definition[28].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[28].Metric | string | `"mem.capacity.provisioned.average"` |  |
-| config.Metrics[0].Definition[29].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[29].Metric | string | `"cpu.corecount.provisioned.average"` |  |
-| config.Metrics[0].Definition[2].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[2].Metric | string | `"cpu.usagemhz.average"` |  |
-| config.Metrics[0].Definition[3].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[3].Metric | string | `"cpu.usagemhz.maximum"` |  |
-| config.Metrics[0].Definition[4].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[4].Metric | string | `"cpu.wait.summation"` |  |
-| config.Metrics[0].Definition[5].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[5].Metric | string | `"cpu.system.summation"` |  |
-| config.Metrics[0].Definition[6].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[6].Metric | string | `"cpu.ready.summation"` |  |
-| config.Metrics[0].Definition[7].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[7].Metric | string | `"mem.usage.average"` |  |
-| config.Metrics[0].Definition[8].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[8].Metric | string | `"mem.usage.maximum"` |  |
-| config.Metrics[0].Definition[9].Instances | string | `"*"` |  |
-| config.Metrics[0].Definition[9].Metric | string | `"mem.consumed.average"` |  |
-| config.Metrics[0].ObjectType[0] | string | `"VirtualMachine"` |  |
-| config.Metrics[0].ObjectType[1] | string | `"HostSystem"` |  |
-| config.Metrics[1].Definition[0].Instances | string | `"*"` |  |
-| config.Metrics[1].Definition[0].Metric | string | `"datastore.datastoreVMObservedLatency.latest"` |  |
-| config.Metrics[1].ObjectType[0] | string | `"VirtualMachine"` |  |
-| config.Metrics[2].Definition[0].Instances | string | `""` |  |
-| config.Metrics[2].Definition[0].Metric | string | `"disk.maxTotalLatency.latest"` |  |
-| config.Metrics[2].Definition[1].Instances | string | `"*"` |  |
-| config.Metrics[2].Definition[1].Metric | string | `"disk.numberReadAveraged.average"` |  |
-| config.Metrics[2].Definition[2].Instances | string | `"*"` |  |
-| config.Metrics[2].Definition[2].Metric | string | `"disk.numberWriteAveraged.average"` |  |
-| config.Metrics[2].Definition[3].Instances | string | `"*"` |  |
-| config.Metrics[2].Definition[3].Metric | string | `"net.throughput.contention.summation"` |  |
-| config.Metrics[2].ObjectType[0] | string | `"HostSystem"` |  |
-| config.Metrics[3].Definition[0].Instances | string | `"*"` |  |
-| config.Metrics[3].Definition[0].Metric | string | `"disk.capacity.latest"` |  |
-| config.Metrics[3].Definition[1].Instances | string | `"*"` |  |
-| config.Metrics[3].Definition[1].Metric | string | `"disk.used.latest"` |  |
-| config.Metrics[3].ObjectType[0] | string | `"Datastore"` |  |
-| config.RemoveHostDomainName | bool | `false` |  |
-| config.VCenters | list | `[]` |  |
-| cronjob.failedJobsHistoryLimit | int | `1` |  |
-| cronjob.schedule | string | `"* * * * *"` |  |
-| cronjob.successfulJobsHistoryLimit | int | `3` |  |
-| fullnameOverride | string | `""` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"nikdoof/vsphere-influxdb-go"` |  |
-| image.tag | string | `"latest"` |  |
-| influxdb.authenticated | bool | `false` |  |
-| influxdb.database | string | `"vmware_performance"` |  |
-| influxdb.hostname | string | `"http://influxdb:8086"` |  |
-| nameOverride | string | `""` |  |
-| nodeSelector | object | `{}` |  |
-| replicaCount | int | `1` |  |
-| resources | object | `{}` |  |
-| tolerations | list | `[]` |  |
-| vsphere.hostname | string | `nil` |  |
-| vsphere.password | string | `nil` |  |
-| vsphere.username | string | `nil` |  |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

charts/vsphere-influxdb-go/ci/test-values.yaml

@@ -1,7 +0,0 @@
-vsphere:
-  hostname: vcenter
-  username: test
-  password: test
-
-influxdb:
-  hostname: test

charts/vsphere-influxdb-go/templates/_helpers.tpl

@@ -1,56 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "vsphere-influxdb-go.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "vsphere-influxdb-go.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "vsphere-influxdb-go.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "vsphere-influxdb-go.labels" -}}
-app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
-helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "vsphere-influxdb-go.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "vsphere-influxdb-go.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

charts/vsphere-influxdb-go/templates/configmap.yaml

@@ -1,13 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vsphere-influxdb-go-config
-  labels:
-    app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
-    helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
-data:
-  config.json: |-
-{{ toJson .Values.config | indent 4}}

charts/vsphere-influxdb-go/templates/cronjob.yaml

@@ -1,98 +0,0 @@
----
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: {{ include "vsphere-influxdb-go.fullname" . }}-cronjob
-  {{- if .Values.deploymentAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.deploymentAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
-    helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
-spec:
-  schedule: {{ .Values.cronjob.schedule | quote }}
-  successfulJobsHistoryLimit: {{ .Values.cronjob.successfulJobsHistoryLimit }}
-  failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}
-  concurrencyPolicy: Forbid
-  {{- if .Values.cronjob.startingDeadlineSeconds }}
-  startingDeadlineSeconds: {{ .Values.cronjob.startingDeadlineSeconds }}
-  {{- end }}
-  jobTemplate:
-    spec:
-      backoffLimit: 0
-      template:
-        metadata:
-          labels:
-            app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
-            helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
-            app.kubernetes.io/instance: {{ .Release.Name }}
-            app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
-        spec:
-          restartPolicy: Never
-          {{- if .Values.image.pullSecrets }}
-          imagePullSecrets:
-          {{- range .Values.image.pullSecrets }}
-            - name: {{ . }}
-          {{- end }}
-          {{- end }}
-          containers:
-          - name: {{ .Chart.Name }}
-            image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-            command: ["/vsphere-influxdb-go", "-config=/config/config.json"]
-            imagePullPolicy: {{ .Values.image.pullPolicy }}
-            resources:
-{{ toYaml .Values.resources | indent 16 }}
-            env:
-              - name: VSPHERE_HOSTNAME
-                value: {{ .Values.vsphere.hostname }}
-              - name: VSPHERE_USERNAME
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
-                    key: vsphere.username              
-              - name: VSPHERE_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
-                    key: vsphere.password
-              - name: INFLUX_HOSTNAME
-                value: {{ .Values.influxdb.hostname }}
-              - name: INFLUX_DATABASE
-                value: {{ .Values.influxdb.database }}
-            {{- if .Values.influxdb.authenticated }}
-              - name: INFLUX_USERNAME
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
-                    key: influxdb.username           
-              - name: INFLUX_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
-                    key: influxdb.password
-            {{- end }}
-            volumeMounts:
-              - name: config-volume
-                mountPath: /config
-          volumes:
-            - name: config-volume
-              configMap:
-                name: vsphere-influxdb-go-config
-
-    {{- with .Values.nodeSelector }}
-          nodeSelector:
-{{ toYaml . | indent 12 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-          affinity:
-{{ toYaml . | indent 12 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-          tolerations:
-{{ toYaml . | indent 12 }}:
-    {{- end }}

charts/vsphere-influxdb-go/templates/secrets.yaml

@@ -1,20 +0,0 @@
----
-{{- if not (.Values.existingSecretName) }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: vsphere-influxdb-go-secret
-  labels:
-    app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
-    helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
-type: Opaque
-data:
-  vsphere.username: {{ .Values.vsphere.username | b64enc }}
-  vsphere.password: {{ .Values.vsphere.password | b64enc }}
-  {{- if .Values.influxdb.authenticated }}
-  influxdb.username: {{ .Values.influxdb.username | b64enc }}
-  influxdb.password: {{ .Values.influxdb.password | b64enc }}
-  {{- end }}
-{{- end }}

charts/vsphere-influxdb-go/values.yaml

@@ -1,155 +0,0 @@
-# Default values for vsphere-influxdb-go.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: nikdoof/vsphere-influxdb-go
-  tag: latest
-  pullPolicy: IfNotPresent
-  # imagePullSecrets: []
-
-nameOverride: ""
-fullnameOverride: ""
-
-## Use a pre-existing secret for login information
-##
-# existingSecretName: existing-secret
-
-## Connection details
-##
-vsphere:
-  hostname:
-  username:
-  password:
-
-influxdb:
-  hostname: http://influxdb:8086
-  authenticated: false
-  # username:
-  # password:
-  database: vmware_performance
-
-cronjob:
-  schedule: "* * * * *"
-  successfulJobsHistoryLimit: 3
-  failedJobsHistoryLimit: 1
-  # startingDeadlineSeconds: 10
-
-## Configuration data that is wrote to vsphere-influxdb-go
-## If you need additional metrics then this is where you can
-## add them.
-##
-config:
-  Domain: ""
-  RemoveHostDomainName: false
-  Interval: 60
-  VCenters: []
-  InfluxDB: []
-  Metrics:
-  - ObjectType:
-    - VirtualMachine
-    - HostSystem
-    Definition:
-    - Metric: cpu.usage.average
-      Instances: "*"
-    - Metric: cpu.usage.maximum
-      Instances: "*"
-    - Metric: cpu.usagemhz.average
-      Instances: "*"
-    - Metric: cpu.usagemhz.maximum
-      Instances: "*"
-    - Metric: cpu.wait.summation
-      Instances: "*"
-    - Metric: cpu.system.summation
-      Instances: "*"
-    - Metric: cpu.ready.summation
-      Instances: "*"
-    - Metric: mem.usage.average
-      Instances: "*"
-    - Metric: mem.usage.maximum
-      Instances: "*"
-    - Metric: mem.consumed.average
-      Instances: "*"
-    - Metric: mem.consumed.maximum
-      Instances: "*"
-    - Metric: mem.active.average
-      Instances: "*"
-    - Metric: mem.active.maximum
-      Instances: "*"
-    - Metric: mem.vmmemctl.average
-      Instances: "*"
-    - Metric: mem.vmmemctl.maximum
-      Instances: "*"
-    - Metric: mem.totalCapacity.average
-      Instances: "*"
-    - Metric: net.packetsRx.summation
-      Instances: "*"
-    - Metric: net.packetsTx.summation
-      Instances: "*"
-    - Metric: net.throughput.usage.average
-      Instances: "*"
-    - Metric: net.received.average
-      Instances: "*"
-    - Metric: net.transmitted.average
-      Instances: "*"
-    - Metric: net.throughput.usage.nfs.average
-      Instances: "*"
-    - Metric: datastore.numberReadAveraged.average
-      Instances: "*"
-    - Metric: datastore.numberWriteAveraged.average
-      Instances: "*"
-    - Metric: datastore.read.average
-      Instances: "*"
-    - Metric: datastore.write.average
-      Instances: "*"
-    - Metric: datastore.totalReadLatency.average
-      Instances: "*"
-    - Metric: datastore.totalWriteLatency.average
-      Instances: "*"
-    - Metric: mem.capacity.provisioned.average
-      Instances: "*"
-    - Metric: cpu.corecount.provisioned.average
-      Instances: "*"
-  - ObjectType:
-    - VirtualMachine
-    Definition:
-    - Metric: datastore.datastoreVMObservedLatency.latest
-      Instances: "*"
-  - ObjectType:
-    - HostSystem
-    Definition:
-    - Metric: disk.maxTotalLatency.latest
-      Instances: ''
-    - Metric: disk.numberReadAveraged.average
-      Instances: "*"
-    - Metric: disk.numberWriteAveraged.average
-      Instances: "*"
-    - Metric: net.throughput.contention.summation
-      Instances: "*"
-  - ObjectType:
-    - Datastore
-    Definition:
-    - Metric: disk.capacity.latest
-      Instances: "*"
-    - Metric: disk.used.latest
-      Instances: "*"
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}

charts/zigbee2mqttassistant/.helmignore

@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

charts/zigbee2mqttassistant/Chart.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-appVersion: "0.3.178"
-description: A web GUI for Zigbee2Mqtt
-name: zigbee2mqttassistant
-version: 0.1.2
-keywords:
-  - zigbee
-  - mqtt
-  - homeassistant
-home: https://github.com/yllibed/Zigbee2MqttAssistant
-sources:
-  - https://hub.docker.com/r/carldebilly/zigbee2mqttassistant
-maintainers:
-  - name: nikdoof
-    email: andy@tensixtyone.com

charts/zigbee2mqttassistant/README.md

@@ -1,47 +0,0 @@
-# zigbee2mqttassistant
-
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: 0.3.178](https://img.shields.io/badge/AppVersion-0.3.178-informational?style=flat-square)
-
-A web GUI for Zigbee2Mqtt
-
-**Homepage:** <https://github.com/yllibed/Zigbee2MqttAssistant>
-
-## Maintainers
-
-| Name | Email | Url |
-| ---- | ------ | --- |
-| nikdoof | andy@tensixtyone.com |  |
-
-## Source Code
-
-* <https://hub.docker.com/r/carldebilly/zigbee2mqttassistant>
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| TZ | string | `"UTC"` |  |
-| affinity | object | `{}` |  |
-| fullnameOverride | string | `""` |  |
-| image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.repository | string | `"carldebilly/zigbee2mqttassistant"` |  |
-| image.tag | string | `"0.3.178"` |  |
-| imagePullSecrets | list | `[]` |  |
-| ingress.annotations | object | `{}` |  |
-| ingress.enabled | bool | `false` |  |
-| ingress.hosts[0].host | string | `"chart-example.local"` |  |
-| ingress.hosts[0].paths | list | `[]` |  |
-| ingress.tls | list | `[]` |  |
-| nameOverride | string | `""` |  |
-| nodeSelector | object | `{}` |  |
-| podSecurityContext | object | `{}` |  |
-| replicaCount | int | `1` |  |
-| resources | object | `{}` |  |
-| securityContext | object | `{}` |  |
-| service.port | int | `8800` |  |
-| service.type | string | `"ClusterIP"` |  |
-| tolerations | list | `[]` |  |
-| z2ma | object | `{}` |  |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

charts/zigbee2mqttassistant/ci/default-values.yaml

@@ -1,3 +0,0 @@
----
-z2ma:
-  broker: mqtt.svc.cluster.local

charts/zigbee2mqttassistant/ci/mqtt-existing.yaml

@@ -1,4 +0,0 @@
----
-z2ma:
-  broker: mqtt.svc.cluster.local
-  existingSecretName: test

charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml

@@ -1,5 +0,0 @@
----
-z2ma:
-  broker: mqtt.svc.cluster.local
-  username: test
-  password: test2

charts/zigbee2mqttassistant/templates/NOTES.txt

@@ -1,21 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "zigbee2mqttassistant.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "zigbee2mqttassistant.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "zigbee2mqttassistant.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "zigbee2mqttassistant.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
-{{- end }}

charts/zigbee2mqttassistant/templates/_helpers.tpl

@@ -1,56 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "zigbee2mqttassistant.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "zigbee2mqttassistant.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "zigbee2mqttassistant.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "zigbee2mqttassistant.labels" -}}
-app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }}
-helm.sh/chart: {{ include "zigbee2mqttassistant.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "zigbee2mqttassistant.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "zigbee2mqttassistant.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}

charts/zigbee2mqttassistant/templates/deployment.yaml

@@ -1,73 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "zigbee2mqttassistant.fullname" . }}
-  labels:
-{{ include "zigbee2mqttassistant.labels" . | indent 4 }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-    spec:
-    {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-          #livenessProbe:
-          #  httpGet:
-          #    path: /
-          #    port: http
-          #readinessProbe:
-          #  httpGet:
-          #    path: /
-          #    port: http
-          env:
-            - name: TZ
-              value: {{ .Values.TZ }}
-            - name: Z2MA_SETTINGS__MQTTSERVER
-              value: {{ .Values.z2ma.broker }}
-            {{- if and (.Values.z2ma.username) (.Values.z2ma.password) }}
-            - name: Z2MA_SETTINGS__MQTTUSERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: {{ default "zigbee2mqttassistant-secret" .Values.z2ma.existingSecretName }}
-                  key: username
-            - name: Z2MA_SETTINGS__MQTTPASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ default "zigbee2mqttassistant-secret" .Values.z2ma.existingSecretName }}
-                  key: password
-            {{- end }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}

charts/zigbee2mqttassistant/templates/ingress.yaml

@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "zigbee2mqttassistant.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-{{ include "zigbee2mqttassistant.labels" . | indent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-        {{- range .paths }}
-          - path: {{ . }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-        {{- end }}
-  {{- end }}
-{{- end }}

charts/zigbee2mqttassistant/templates/secrets.yaml

@@ -1,15 +0,0 @@
-{{- if and (and (not (.Values.existingSecretName)) (.Values.z2ma.username)) (.Values.z2ma.password) }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "zigbee2mqttassistant.name" . }}-secret
-  labels:
-    app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }}
-    helm.sh/chart: {{ include "zigbee2mqttassistant.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ include "zigbee2mqttassistant.name" . }}
-type: Opaque
-data:
-  username: {{ .Values.z2ma.username | b64enc }}
-  password: {{ .Values.z2ma.password | b64enc }}
-{{- end }}

charts/zigbee2mqttassistant/templates/service.yaml

@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "zigbee2mqttassistant.fullname" . }}
-  labels:
-{{ include "zigbee2mqttassistant.labels" . | indent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}

charts/zigbee2mqttassistant/values.yaml

@@ -1,77 +0,0 @@
-# Default values for zigbee2mqttassistant.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: carldebilly/zigbee2mqttassistant
-  tag: 0.3.178
-  pullPolicy: IfNotPresent
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-TZ: UTC
-
-## Z2MA Settings (more details: https://github.com/yllibed/Zigbee2MqttAssistant/blob/master/README.md)
-z2ma: {}
-  # broker: mqtt.svc.cluster.local
-
-  ## You can provide your MQTT username and password and a secret will be created...
-  ##
-  # username: user
-  # password: pass
-
-  ## ... or you can provide a existing secret to pull these values from
-  ##
-  # existingSecretName: mqtt-secret
-
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 8800
-
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths: []
-
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}