user25/prometheus-training-lab-setup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflict

Browse Source
This commit is contained in:
Raffael H 2023-08-10 10:30:04 +02:00
parent 9665fbc8a4
commit b563303559
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/user-monitoring/Chart.yaml
View File

@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.2 version: 0.1.3
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to # incremented each time you make changes to the application. Versions are not expected to

4
charts/user-monitoring/templates/user-prometheus.yaml
View File

@ -20,10 +20,6 @@ spec:
resources: resources:
requests: requests:
memory: 400Mi memory: 400Mi
<<<<<<< HEAD
enableAdminAPI: false
=======
enableAdminAPI: true enableAdminAPI: true
externalLabels: externalLabels:
monitoring: {{ .Values.user }} monitoring: {{ .Values.user }}
>>>>>>> 2acef0e (Update prometheus config)