From 8af120298a650d9d1df694031df954fae0cf4feb Mon Sep 17 00:00:00 2001
From: Blair Bowden <blair@radiusmethod.com>
Date: Thu, 9 Jan 2025 14:16:03 -0500
Subject: [PATCH 1/3] add fallback scrape protocol
---
.../gitlab/charts/gitlab-exporter/templates/servicemonitor.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/chart/charts/gitlab/charts/gitlab-exporter/templates/servicemonitor.yaml b/chart/charts/gitlab/charts/gitlab-exporter/templates/servicemonitor.yaml
index f09ad4d3d..8320c79a8 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 -}}
--
GitLab
From f0004e8cbf5fed1963db2687a810503a1b4034b6 Mon Sep 17 00:00:00 2001
From: Blair Bowden <blair@radiusmethod.com>
Date: Thu, 9 Jan 2025 14:32:01 -0500
Subject: [PATCH 2/3] docsg
---
CHANGELOG.md | 5 +++++
README.md | 6 +++---
docs/DEVELOPMENT_MAINTENANCE.md | 8 ++++++++
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3fdc6c05..ffc1ef4d7 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 decebb1bd..6d223c27b 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,9 @@
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/docs/DEVELOPMENT_MAINTENANCE.md b/docs/DEVELOPMENT_MAINTENANCE.md
index 514b4b591..7e37d24c4 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.
--
GitLab
From 81bf894e256ae23aefa29cfd9f2874df76e6e29b Mon Sep 17 00:00:00 2001
From: Blair Bowden <blair@radiusmethod.com>
Date: Thu, 9 Jan 2025 14:35:42 -0500
Subject: [PATCH 3/3] forgot to update chart vers too
---
README.md | 2 +-
chart/Chart.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 6d223c27b..12563ef09 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
<!-- 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.
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 6ad2fc358..2cc520c06 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:
--
GitLab