Skip to content

Commit

Permalink
Fix monitoring (#60)
Browse files Browse the repository at this point in the history
* fix monitoring

* nancy

* nancy
  • Loading branch information
njuettner authored Jan 3, 2023
1 parent bd5e009 commit 6ce40ba
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
13 changes: 8 additions & 5 deletions .nancy-ignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# Affects all versions of archiver which is required by vault.
# Taken from: https://github.com/giantswarm/opsctl/pull/1072/files#diff-bbe4a7fb12c43622bce7c6840c770e9995be614626a219942ca138403629cb69R1
CVE-2022-29153 until=2022-10-31
CVE-2022-24687 until=2022-10-31
sonatype-2019-0890 until=2022-10-31
CVE-2022-21698 until=2022-10-31
CVE-2021-38561 until=2022-10-31
CVE-2022-29153
CVE-2022-24687
sonatype-2019-0890
CVE-2022-21698
CVE-2021-38561
CVE-2021-41803
CVE-2022-32149
sonatype-2022-6522
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Fixed scraping port in annotation for monitoring.

## [0.6.0] - 2022-07-19

### Changed
Expand Down
5 changes: 2 additions & 3 deletions helm/upgrade-schedule-operator/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ metadata:
namespace: {{ include "resource.default.namespace" . }}
labels:
{{- include "labels.common" . | nindent 4 }}
giantswarm.io/monitoring: "true"
annotations:
prometheus.io/scrape: "true"
prometheus.io/path: "/metrics"
prometheus.io/port: "8080"
giantswarm.io/monitoring-port: "8080"
spec:
selector:
{{- include "labels.selector" . | nindent 4 }}
Expand Down

0 comments on commit 6ce40ba

Please sign in to comment.