From c9c4add17602becd29a9fbb55ddcab72dced249c Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Tue, 2 Feb 2021 16:13:28 +0000 Subject: [PATCH 1/9] added plugins to install --- chart/values.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chart/values.yaml b/chart/values.yaml index 527bbcc..5131962 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -148,7 +148,11 @@ initSysctl: # - "https://github.com/AmadeusITGroup/sonar-stash/releases/download/1.3.0/sonar-stash-plugin-1.3.0.jar" # - "https://github.com/SonarSource/sonar-ldap/releases/download/2.2-RC3/sonar-ldap-plugin-2.2.0.601.jar" plugins: - install: [] + install: + - https://github.com/dependency-check/dependency-check-sonar-plugin/releases/download/1.2.6/sonar-dependency-check-plugin-1.2.6.jar + - https://github.com/SonarOpenCommunity/sonar-cxx/releases/download/cxx-1.3.2/sonar-c-plugin-1.3.2.1853.jar + - https://github.com/SonarOpenCommunity/sonar-cxx/releases/download/cxx-1.3.2/sonar-cxx-plugin-1.3.2.1853.jar + - https://github.com/dmeiners88/sonarqube-prometheus-exporter/releases/download/v1.0.0-SNAPSHOT-2018-07-04/sonar-prometheus-exporter-1.0.0-SNAPSHOT.jar lib: [] # For use behind a corporate proxy when downloading plugins -- GitLab From a9c38f74b8cafd1e4f5b99a7376b798ca0350ee3 Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Tue, 2 Feb 2021 16:15:25 +0000 Subject: [PATCH 2/9] added plugins in test-values --- tests/test-values.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index 0a6dca5..d01a9b3 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -148,7 +148,11 @@ initSysctl: # - "https://github.com/AmadeusITGroup/sonar-stash/releases/download/1.3.0/sonar-stash-plugin-1.3.0.jar" # - "https://github.com/SonarSource/sonar-ldap/releases/download/2.2-RC3/sonar-ldap-plugin-2.2.0.601.jar" plugins: - install: [] + install: + - https://github.com/dependency-check/dependency-check-sonar-plugin/releases/download/1.2.6/sonar-dependency-check-plugin-1.2.6.jar + - https://github.com/SonarOpenCommunity/sonar-cxx/releases/download/cxx-1.3.2/sonar-c-plugin-1.3.2.1853.jar + - https://github.com/SonarOpenCommunity/sonar-cxx/releases/download/cxx-1.3.2/sonar-cxx-plugin-1.3.2.1853.jar + - https://github.com/dmeiners88/sonarqube-prometheus-exporter/releases/download/v1.0.0-SNAPSHOT-2018-07-04/sonar-prometheus-exporter-1.0.0-SNAPSHOT.jar lib: [] # For use behind a corporate proxy when downloading plugins -- GitLab From 1d72dbb7dec7fd06948db56ce4e47fb0a613893b Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Tue, 2 Feb 2021 16:26:06 +0000 Subject: [PATCH 3/9] version bump --- chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 31a42e1..3cd1616 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 8.6-community name: sonarqube description: SonarQube is an open sourced code quality scanning tool -version: 9.2.6-bb.0 +version: 9.2.6-bb.1 keywords: - coverage - security -- GitLab From 1e8d21c3b5e81afba6f666d4b73747d331fbfef9 Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Tue, 2 Feb 2021 17:36:52 +0000 Subject: [PATCH 4/9] adding monitoring in values --- chart/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chart/values.yaml b/chart/values.yaml index 5131962..7f51814 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -357,3 +357,5 @@ terminationGracePeriodSeconds: 60 hostname: bigbang.dev istio: enabled: true +monitoring: + enabled: true -- GitLab From 398a376ee30c83dc7a29448ac5fc6c79f6a99217 Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Tue, 2 Feb 2021 17:37:17 +0000 Subject: [PATCH 5/9] Update test-values.yml --- tests/test-values.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test-values.yml b/tests/test-values.yml index d01a9b3..351f5ff 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -357,3 +357,5 @@ terminationGracePeriodSeconds: 60 hostname: bigbang.dev istio: enabled: true +monitoring: + enabled: true -- GitLab From 8452dcc6e5c1d5331e8218aae02420393a312ecc Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Tue, 2 Feb 2021 17:50:47 +0000 Subject: [PATCH 6/9] Add new file --- chart/templates/monitoring.yaml | 66 +++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 chart/templates/monitoring.yaml diff --git a/chart/templates/monitoring.yaml b/chart/templates/monitoring.yaml new file mode 100644 index 0000000..66155c2 --- /dev/null +++ b/chart/templates/monitoring.yaml @@ -0,0 +1,66 @@ +{{- if .Values.monitoring.enabled -}} +apiVersion: rbac.authorization.k8s.io/v1 +items: +- apiVersion: rbac.authorization.k8s.io/v1 + kind: Role + metadata: + name: prometheus-k8s + namespace: {{ .Release.Namespace }} + rules: + - apiGroups: + - "" + resources: + - services + - endpoints + - pods + verbs: + - get + - list + - watch +kind: RoleList + +--- +apiVersion: rbac.authorization.k8s.io/v1 +items: +- apiVersion: rbac.authorization.k8s.io/v1 + kind: RoleBinding + metadata: + name: prometheus-k8s + namespace: {{ .Release.Namespace }} + roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: prometheus-k8s + subjects: + - kind: ServiceAccount + name: prometheus-k8s + namespace: monitoring +kind: RoleBindingList + +--- +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + labels: + prometheus: k8s + name: {{ template "sonarqube.fullname" . }} +spec: + selector: + matchLabels: + app: {{ template "sonarqube.fullname" . }} + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + endpoints: + - interval: 30s + basicAuth: + password: admin +# name: login +# key: username + username: admin +# name: login +# key: password + path: /api/prometheus/metrics + port: http + jobLabel: sonarqube +{{- end }} -- GitLab From dbfdb1cb7ac0e17660a8f266c58017275a5b59bf Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Tue, 2 Feb 2021 18:01:05 +0000 Subject: [PATCH 7/9] Update values.yaml --- chart/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/values.yaml b/chart/values.yaml index 7f51814..7f0a2b8 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -358,4 +358,4 @@ hostname: bigbang.dev istio: enabled: true monitoring: - enabled: true + enabled: false -- GitLab From 1b35cd216838a7f96f661469cb443ed24fa9a9fa Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Tue, 2 Feb 2021 18:01:26 +0000 Subject: [PATCH 8/9] Update test-values.yml --- tests/test-values.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index 351f5ff..af9d6e2 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -358,4 +358,4 @@ hostname: bigbang.dev istio: enabled: true monitoring: - enabled: true + enabled: false -- GitLab From 3b15417721858fe8cdac030304b139b11a85fb32 Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Wed, 3 Feb 2021 12:58:35 +0000 Subject: [PATCH 9/9] moved vs and monitoring into bigbang folder --- chart/templates/{ => bigbang}/monitoring.yaml | 0 chart/templates/{ => bigbang}/virtualservice.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename chart/templates/{ => bigbang}/monitoring.yaml (100%) rename chart/templates/{ => bigbang}/virtualservice.yaml (100%) diff --git a/chart/templates/monitoring.yaml b/chart/templates/bigbang/monitoring.yaml similarity index 100% rename from chart/templates/monitoring.yaml rename to chart/templates/bigbang/monitoring.yaml diff --git a/chart/templates/virtualservice.yaml b/chart/templates/bigbang/virtualservice.yaml similarity index 100% rename from chart/templates/virtualservice.yaml rename to chart/templates/bigbang/virtualservice.yaml -- GitLab