From 36d4ef379da71b35205469184e460d6386e92eea Mon Sep 17 00:00:00 2001 From: Joachim Winkler Date: Wed, 6 Aug 2025 08:03:45 +0200 Subject: [PATCH 1/6] bump helm chart version to 0.9.0 --- charts/prometheus-artifactory-exporter/Chart.yaml | 4 ++-- charts/prometheus-artifactory-exporter/values.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/prometheus-artifactory-exporter/Chart.yaml b/charts/prometheus-artifactory-exporter/Chart.yaml index dcf8ecc..be53818 100644 --- a/charts/prometheus-artifactory-exporter/Chart.yaml +++ b/charts/prometheus-artifactory-exporter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "1.15.1" +appVersion: "1.16.0" description: A Helm chart for the Prometheus Artifactory Exporter name: prometheus-artifactory-exporter -version: 0.8.1 +version: 0.9.0 keywords: - metrics - artifactory diff --git a/charts/prometheus-artifactory-exporter/values.yaml b/charts/prometheus-artifactory-exporter/values.yaml index a583bcf..e0751e8 100644 --- a/charts/prometheus-artifactory-exporter/values.yaml +++ b/charts/prometheus-artifactory-exporter/values.yaml @@ -23,7 +23,7 @@ image: registry: ghcr.io repository: peimanja/artifactory_exporter # set to canary for the latest unreleased version - tag: v1.15.1 + tag: v1.16.0 pullPolicy: IfNotPresent # imagePullSecrets: @@ -67,7 +67,7 @@ service: annotations: {} ingress: - enabled: false + enabled: true annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" @@ -77,7 +77,7 @@ ingress: tls: [] # - secretName: chart-example-tls # hosts: - # - chart-example.local + # - chart-example.local resources: {} # We usually recommend not to specify default resources and to leave this as a conscious From ef6d0bcea4109a7796e1d5ed514364a7451ca32a Mon Sep 17 00:00:00 2001 From: Joachim Winkler Date: Thu, 4 Sep 2025 12:57:22 +0200 Subject: [PATCH 2/6] add new options to helm chart --- .../prometheus-artifactory-exporter/templates/deployment.yaml | 3 +++ charts/prometheus-artifactory-exporter/values.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/charts/prometheus-artifactory-exporter/templates/deployment.yaml b/charts/prometheus-artifactory-exporter/templates/deployment.yaml index 64c8431..4a4c2ce 100644 --- a/charts/prometheus-artifactory-exporter/templates/deployment.yaml +++ b/charts/prometheus-artifactory-exporter/templates/deployment.yaml @@ -45,6 +45,9 @@ spec: args: - "--log.level={{ .Values.options.logLevel }}" - "--log.format={{ .Values.options.logFormat }}" + - "--use-cache={{ .Values.options.useCache }}" + - "--cache-timeout={{ .Values.options.cacheTimeout }}" + - "--cache-ttl={{ .Values.options.cacheTTL }}" {{- range $metric := .Values.options.optionalMetrics }} - "--optional-metric={{ $metric }}" {{- end }} diff --git a/charts/prometheus-artifactory-exporter/values.yaml b/charts/prometheus-artifactory-exporter/values.yaml index e0751e8..8cd0e99 100644 --- a/charts/prometheus-artifactory-exporter/values.yaml +++ b/charts/prometheus-artifactory-exporter/values.yaml @@ -51,6 +51,9 @@ options: telemetryPath: /metrics verifySSL: false timeout: 5s + useCache: false + cacheTimeout: 30s + cacheTTL: 5m # Some metrics are expensive to collect, so they are disabled by default. # visit https://github.com/peimanja/artifactory_exporter#optional-metrics for more details optionalMetrics: [] From 30410c181bf3b43081b3e403b0be65aee825fffd Mon Sep 17 00:00:00 2001 From: Joachim Winkler Date: Thu, 4 Sep 2025 13:37:56 +0200 Subject: [PATCH 3/6] add new options including default --- .../templates/deployment.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/prometheus-artifactory-exporter/templates/deployment.yaml b/charts/prometheus-artifactory-exporter/templates/deployment.yaml index 4a4c2ce..bd8ee52 100644 --- a/charts/prometheus-artifactory-exporter/templates/deployment.yaml +++ b/charts/prometheus-artifactory-exporter/templates/deployment.yaml @@ -45,9 +45,9 @@ spec: args: - "--log.level={{ .Values.options.logLevel }}" - "--log.format={{ .Values.options.logFormat }}" - - "--use-cache={{ .Values.options.useCache }}" - - "--cache-timeout={{ .Values.options.cacheTimeout }}" - - "--cache-ttl={{ .Values.options.cacheTTL }}" + - "--use-cache={{ .Values.options.useCache | quote }}" + - "--cache-timeout={{ .Values.options.cacheTimeout | default "30s" }}" + - "--cache-ttl={{ .Values.options.cacheTTL | default "5m"}}" {{- range $metric := .Values.options.optionalMetrics }} - "--optional-metric={{ $metric }}" {{- end }} From 63140ded79ba18f73c6bad79a5d1e758df2eb4ff Mon Sep 17 00:00:00 2001 From: Joachim Winkler Date: Thu, 4 Sep 2025 14:27:01 +0200 Subject: [PATCH 4/6] add new options including default --- .../prometheus-artifactory-exporter/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-artifactory-exporter/templates/deployment.yaml b/charts/prometheus-artifactory-exporter/templates/deployment.yaml index bd8ee52..9656142 100644 --- a/charts/prometheus-artifactory-exporter/templates/deployment.yaml +++ b/charts/prometheus-artifactory-exporter/templates/deployment.yaml @@ -30,7 +30,7 @@ spec: {{- end }} spec: {{- if or .Values.imagePullSecrets .Values.global.imagePullSecrets }} -{{- include "prometheus-artifactory-exporter.imagePullSecrets" . | indent 6 }} + {{- include "prometheus-artifactory-exporter.imagePullSecrets" . | indent 6 }} {{- end }} serviceAccountName: {{ template "prometheus-artifactory-exporter.serviceAccountName" . }} {{- with .Values.initContainers }} @@ -45,7 +45,7 @@ spec: args: - "--log.level={{ .Values.options.logLevel }}" - "--log.format={{ .Values.options.logFormat }}" - - "--use-cache={{ .Values.options.useCache | quote }}" + - "--use-cache={{ .Values.options.useCache | default false }}" - "--cache-timeout={{ .Values.options.cacheTimeout | default "30s" }}" - "--cache-ttl={{ .Values.options.cacheTTL | default "5m"}}" {{- range $metric := .Values.options.optionalMetrics }} From 2f54acd6d0074435cef318f98ee1b49bf49bbaff Mon Sep 17 00:00:00 2001 From: Joachim Winkler Date: Thu, 4 Sep 2025 14:52:42 +0200 Subject: [PATCH 5/6] enable cache only if needed --- .../prometheus-artifactory-exporter/templates/deployment.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/prometheus-artifactory-exporter/templates/deployment.yaml b/charts/prometheus-artifactory-exporter/templates/deployment.yaml index 9656142..34d42ea 100644 --- a/charts/prometheus-artifactory-exporter/templates/deployment.yaml +++ b/charts/prometheus-artifactory-exporter/templates/deployment.yaml @@ -45,9 +45,11 @@ spec: args: - "--log.level={{ .Values.options.logLevel }}" - "--log.format={{ .Values.options.logFormat }}" - - "--use-cache={{ .Values.options.useCache | default false }}" + {{- if .Values.options.useCache }} + - "--use-cache" - "--cache-timeout={{ .Values.options.cacheTimeout | default "30s" }}" - "--cache-ttl={{ .Values.options.cacheTTL | default "5m"}}" + {{- end }} {{- range $metric := .Values.options.optionalMetrics }} - "--optional-metric={{ $metric }}" {{- end }} From 69e0cdd86690ad7db80e3fce77b0a6fa173adef8 Mon Sep 17 00:00:00 2001 From: Joachim Winkler Date: Fri, 5 Sep 2025 07:54:34 +0200 Subject: [PATCH 6/6] disable ingress by default --- .../prometheus-artifactory-exporter/templates/deployment.yaml | 2 +- charts/prometheus-artifactory-exporter/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/prometheus-artifactory-exporter/templates/deployment.yaml b/charts/prometheus-artifactory-exporter/templates/deployment.yaml index 34d42ea..74b612d 100644 --- a/charts/prometheus-artifactory-exporter/templates/deployment.yaml +++ b/charts/prometheus-artifactory-exporter/templates/deployment.yaml @@ -30,7 +30,7 @@ spec: {{- end }} spec: {{- if or .Values.imagePullSecrets .Values.global.imagePullSecrets }} - {{- include "prometheus-artifactory-exporter.imagePullSecrets" . | indent 6 }} +{{- include "prometheus-artifactory-exporter.imagePullSecrets" . | indent 6 }} {{- end }} serviceAccountName: {{ template "prometheus-artifactory-exporter.serviceAccountName" . }} {{- with .Values.initContainers }} diff --git a/charts/prometheus-artifactory-exporter/values.yaml b/charts/prometheus-artifactory-exporter/values.yaml index 8cd0e99..2575c71 100644 --- a/charts/prometheus-artifactory-exporter/values.yaml +++ b/charts/prometheus-artifactory-exporter/values.yaml @@ -70,7 +70,7 @@ service: annotations: {} ingress: - enabled: true + enabled: false annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true"