From 80429537e6617941145fcf07edab971820a417c9 Mon Sep 17 00:00:00 2001 From: alexlebens Date: Sun, 23 Jun 2024 18:09:00 -0500 Subject: [PATCH] convert to app template --- clusters/cl01tl/services/unpoller/Chart.yaml | 9 +- .../unpoller/templates/service-monitor.yaml | 21 +++++ clusters/cl01tl/services/unpoller/values.yaml | 87 ++++++++++++------- 3 files changed, 81 insertions(+), 36 deletions(-) create mode 100644 clusters/cl01tl/services/unpoller/templates/service-monitor.yaml diff --git a/clusters/cl01tl/services/unpoller/Chart.yaml b/clusters/cl01tl/services/unpoller/Chart.yaml index f51486466..68bdd19ac 100644 --- a/clusters/cl01tl/services/unpoller/Chart.yaml +++ b/clusters/cl01tl/services/unpoller/Chart.yaml @@ -11,12 +11,13 @@ home: "" sources: - https://github.com/unpoller/unpoller - https://github.com/unpoller/unpoller/pkgs/container/unpoller - - https://github.com/homeylab/helm-charts/tree/main/charts/unpoller + - https://github.com/bjw-s/helm-charts/blob/main/charts/other/app-template/values.yaml maintainers: - name: alexlebens dependencies: - - name: unpoller - version: 2.1.0 - repository: https://homeylab.github.io/helm-charts/ + - name: app-template + alias: unpoller + repository: https://bjw-s.github.io/helm-charts/ + version: 3.2.1 icon: https://camo.githubusercontent.com/c5d07a5b3acfeac8e1c25bf56f440ffe032b86e4e7f15de82357f022a43fc927/68747470733a2f2f756e706f6c6c65722e636f6d2f696d672f6c6f676f2e706e67 appVersion: v2.11.2 diff --git a/clusters/cl01tl/services/unpoller/templates/service-monitor.yaml b/clusters/cl01tl/services/unpoller/templates/service-monitor.yaml new file mode 100644 index 000000000..f1a82bf13 --- /dev/null +++ b/clusters/cl01tl/services/unpoller/templates/service-monitor.yaml @@ -0,0 +1,21 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: unpoller + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: unpoller + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} + app.kubernetes.io/component: metrics + app.kubernetes.io/part-of: {{ .Release.Name }} +spec: + selector: + matchLabels: + app.kubernetes.io/name: unpoller + app.kubernetes.io/instance: {{ .Release.Name }} + endpoints: + - port: metrics + interval: 3m + scrapeTimeout: 1m + path: /metrics diff --git a/clusters/cl01tl/services/unpoller/values.yaml b/clusters/cl01tl/services/unpoller/values.yaml index 999cdbb09..545c44a9d 100644 --- a/clusters/cl01tl/services/unpoller/values.yaml +++ b/clusters/cl01tl/services/unpoller/values.yaml @@ -1,34 +1,57 @@ unpoller: - replicaCount: 1 - image: - name: unpoller/unpoller - tag: v2.11.2 - pullPolicy: IfNotPresent - updateStrategy: - type: Recreate + controllers: + main: + type: deployment + replicas: 1 + strategy: Recreate + revisionHistoryLimit: 3 + containers: + main: + image: + repository: ghcr.io/unpoller/unpollers + tag: v2.11.2 + pullPolicy: IfNotPresent + env: + - name: UP_UNIFI_CONTROLLER_0_SAVE_ALARMS + value: 'false' + - name: UP_UNIFI_CONTROLLER_0_SAVE_ANOMALIES + value: 'false' + - name: UP_UNIFI_CONTROLLER_0_SAVE_DPI + value: 'false' + - name: UP_UNIFI_CONTROLLER_0_SAVE_EVENTS + value: 'false' + - name: UP_UNIFI_CONTROLLER_0_SAVE_IDS + value: 'false' + - name: UP_UNIFI_CONTROLLER_0_SAVE_SITES + value: 'true' + - name: UP_UNIFI_CONTROLLER_0_URL + value: https://unifi.alexlebens.net/ + - name: UP_UNIFI_CONTROLLER_0_VERIFY_SSL + value: 'false' + - name: UP_INFLUXDB_DISABLE + value: 'true' + - name: UP_PROMETHEUS_HTTP_LISTEN + value: 0.0.0.0:9130 + - name: UP_PROMETHEUS_NAMESPACE + value: unpoller + - name: UP_POLLER_DEBUG + value: 'false' + - name: UP_POLLER_QUIET + value: 'false' + envFrom: + - secretRef: + name: unpoller-unifi-secret + resources: + requests: + cpu: 100m + memory: 128Mi + serviceAccount: + create: true service: - type: ClusterIP - port: 9130 - protocol: TCP - name: metrics - metrics: - enabled: true - serviceMonitor: - enabled: true - interval: 30s - scrapeTimeout: 10s - prometheusRule: - enabled: true - existingSecret: unpoller-unifi-secret - settings: - unifi: - config: - url: https://unifi.alexlebens.net/ - save_sites: true - verify_ssl: false - prometheus: - namespace: unpoller - http_listen: "0.0.0.0:9130" - unpoller: - debug: false - quiet: false + main: + controller: main + ports: + metrics: + port: 9130 + targetPort: 9130 + protocol: TCP