diff --git a/CHANGELOG.md b/CHANGELOG.md index f3fdc6c0501197dd804cb2eac1da5fb64ec14a76..ffc1ef4d77c13a4f4a42c1f77faabeb0b371b5f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), --- +## [8.6.2-bb.1] (2024-12-16) + +### Changed +- added `fallbackScrapeConfig` to gitlab-exporter which will allow metrics to be scraped if Prometheus V3 API does not detect a set `Content-Type` + ## [8.6.2-bb.0] (2024-12-16) ### Changed diff --git a/README.md b/README.md index decebb1bda821ffbdd7f0622763a92686636410d..12563ef0987dd3e5887d5a959c259112a0408837 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,14 @@ <!-- Warning: Do not manually edit this file. See notes on gluon + helm-docs at the end of this file for more information. --> # gitlab -   +   GitLab is the most comprehensive AI-powered DevSecOps Platform. ## Upstream References - - <https://about.gitlab.com/> -- <https://gitlab.com/gitlab-org/charts/gitlab> +* <https://gitlab.com/gitlab-org/charts/gitlab> ## Upstream Release Notes @@ -28,7 +27,7 @@ The [upstream chart's release notes](https://gitlab.com/gitlab-org/charts/gitlab Install Helm -<https://helm.sh/docs/intro/install/> +https://helm.sh/docs/intro/install/ ## Deployment @@ -1147,3 +1146,4 @@ Please see the [contributing guide](./CONTRIBUTING.md) if you are interested in --- _This file is programatically generated using `helm-docs` and some BigBang-specific templates. The `gluon` repository has [instructions for regenerating package READMEs](https://repo1.dso.mil/big-bang/product/packages/gluon/-/blob/master/docs/bb-package-readme.md)._ + diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 6ad2fc358d8f3d24c7db24145bddc8ca889090ac..2cc520c0677555c468264eb271c7d44385916cb3 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v1 name: gitlab -version: 8.6.2-bb.0 +version: 8.6.2-bb.1 appVersion: 17.6.2 description: GitLab is the most comprehensive AI-powered DevSecOps Platform. keywords: diff --git a/chart/charts/gitlab/charts/gitlab-exporter/templates/servicemonitor.yaml b/chart/charts/gitlab/charts/gitlab-exporter/templates/servicemonitor.yaml index f09ad4d3d5c2decf1468ab77ccaed10ef2a5f51d..8320c79a8f6d9e9cbe2a85c0b8f454b12530c191 100644 --- a/chart/charts/gitlab/charts/gitlab-exporter/templates/servicemonitor.yaml +++ b/chart/charts/gitlab/charts/gitlab-exporter/templates/servicemonitor.yaml @@ -24,5 +24,6 @@ spec: {{- with .Values.metrics.serviceMonitor.endpointConfig }} {{- toYaml . | nindent 6 }} {{- end }} + fallbackScrapeProtocol: {{ .Values.metrics.serviceMonitor.fallbackScrapeProtocol }} {{- end -}} {{- end -}} diff --git a/docs/DEVELOPMENT_MAINTENANCE.md b/docs/DEVELOPMENT_MAINTENANCE.md index 514b4b591d0e254a6fe5ce85e5e2d111e7b711fc..7e37d24c48cb0d4754c6ec801757961b1706756d 100644 --- a/docs/DEVELOPMENT_MAINTENANCE.md +++ b/docs/DEVELOPMENT_MAINTENANCE.md @@ -381,6 +381,14 @@ If that is not present it will use the global chart serviceAccount automountServ /usr/bin/mc policy set $POLICY myminio/$BUCKET ``` +## chart/charts/gitlab/charts/gitlab-exporter/templates/servicemonitor.yaml + +- L27 Add `fallbackScrapeProtocol` and assume value set in values on Gitlab/Umbrella + + ```yaml + fallbackScrapeProtocol: {{ .Values.metrics.serviceMonitor.fallbackScrapeProtocol }} + ``` + ## chart/charts/*.tgz - Run `helm dependency update ./chart` and commit the downloaded archives.