Skip to content

Changed ServiceMonitor discovery mechanism to role selector #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mskwierczynski982 wants to merge 1 commit into from
Closed

Changed ServiceMonitor discovery mechanism to role selector #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/core/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
name: charts-core
description: A Helm chart for Kubernetes
type: application
version: 2.12.0
version: 2.13.0
3 changes: 3 additions & 0 deletions charts/core/templates/CRD/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ metadata:
labels:
app.kubernetes.io/name: {{ .Release.Name }}
spec:
{{- if .Values.global.monitoring.servicemonitor.roleSelectorDiscoveryMechanism }}
selectorMechanism: RoleSelector
{{- end }}
endpoints:
- path: {{ .Values.global.monitoring.metrics.path }}
targetPort: {{ .Values.global.monitoring.metrics.port }}
Expand Down
2 changes: 1 addition & 1 deletion charts/core/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ global:
path: /metrics
servicemonitor:
enabled: false # setting to enable or disable monitoring of service on endpoint /metrics. Service should support exporting metrics to that endpoint first

roleSelectorDiscoveryMechanism: true
# prometheus server settings for existing prometheus installation. Currently needed only for canary deployments.
prometheusService: prometheus-operator-kube-p-prometheus
prometheusPort: 9090
Expand Down
4 changes: 2 additions & 2 deletions charts/dotnet-core/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
description: EcoVadis Helm chart for .Net Core app
name: charts-dotnet-core
type: application
version: 4.14.0
version: 4.15.0
dependencies:
- name: charts-core
version: "2.12.0"
version: "2.13.0"
repository: "https://ecovadiscode.github.io/charts/"
2 changes: 1 addition & 1 deletion charts/dotnet-core/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ global:
path: /metrics
servicemonitor:
enabled: true # setting to enable or disable monitoring of service on endpoint /metrics. Service should support exporting metrics to that endpoint first. NOTE: global.monitoring.metrics should be enabled as well.

roleSelectorDiscoveryMechanism: true
# prometheus server settings for existing prometheus installation. Currently needed only for canary deployments.
prometheusService: prometheus-operator-kube-p-prometheus
prometheusPort: 9090
Expand Down
4 changes: 2 additions & 2 deletions charts/event-worker/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
description: EcoVadis Helm chart for K8s Event driven Deployment
name: charts-event-worker
type: application
version: 1.10.0
version: 1.11.0
dependencies:
- name: charts-core
version: 2.12.0
version: 2.13.0
repository: "https://ecovadiscode.github.io/charts/"
1 change: 1 addition & 0 deletions charts/event-worker/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ global:
path: /metrics
servicemonitor:
enabled: false # TODO: Change when worker.template will be updated
roleSelectorDiscoveryMechanism: true
metricsServer:
image:
repository: "cicdcr01weuy01.azurecr.io"
Expand Down
Loading