Fixes k8ssandra#1563 Invalid Metric name in prometheus based on k8ssa…

…ndra-operator fix 927

CHANGELOG-1.6.md

@@ -32,3 +32,4 @@ and date `## vX.Y.Z - YYYY-MM-DD` and create a new placeholder section for `unr
 * [BUGFIX] [#1404](https://github.com/k8ssandra/k8ssandra/issues/1404) Fix `garbage_collector` property to use G1GC
 * [ENHANCEMENT] [#1135](https://github.com/k8ssandra/k8ssandra/issues/1135) Add support for service account annotations in helm chart.
 * [ENHANCEMENT] [#1612](https://github.com/k8ssandra/k8ssandra/issues/1612) Add support for nodeSelector and tolerations in cass-operator helm chart.
+* [BUGFIX] [#1563](https://github.com/k8ssandra/k8ssandra/issues/) Prometheus "invalid metric name or label names" error while scraping cassandra metrics

charts/k8ssandra/templates/prometheus/service_monitor.yaml

@@ -224,13 +224,27 @@ spec:
  sourceLabels:
  - mcac
  targetLabel: __name__
- - regex: org\.apache\.cassandra\.metrics\.hints_service\.hints_delays\-(\w+)
+ - action: replace
+ regex: org\.apache\.cassandra\.metrics\.hints_service\.hint_delays[\-\.]([\w\.]+)
  replacement: ${1}
  sourceLabels:
  - mcac
  targetLabel: peer_ip
- - regex: org\.apache\.cassandra\.metrics\.hints_service\.hints_delays\-(\w+)
- replacement: mcac_hints_hints_delays
+ - action: replace
+ regex: org\.apache\.cassandra\.metrics\.hints_service\.hint_delays[\-\.]([\w\.]+)
+ replacement: mcac_hints_hint_delays
+ sourceLabels:
+ - mcac
+ targetLabel: __name__
+ - action: replace
+ regex: org\.apache\.cassandra\.metrics\.hints_service\.hints_created[\-\.]([\w\.]+)
+ replacement: ${1}
+ sourceLabels:
+ - mcac
+ targetLabel: peer_ip
+ - action: replace
+ regex: org\.apache\.cassandra\.metrics\.hints_service\.hints_created[\-\.]([\w\.]+)
+ replacement: mcac_hints_hint_created
  sourceLabels:
  - mcac
  targetLabel: __name__
@@ -308,4 +322,8 @@ spec:
  targetLabel: __name__
  - action: labeldrop
  regex: prom_name
+ - action: drop
+ regex: (.*)\.+(.*)
+ sourceLabels:
+ - __name__
 {{- end }}