Merge pull request #73 from kyverno/loki-target-fix

Fix Loki Labels
kyverno · Sep 15, 2021 · 8bdb284 · 8bdb284
2 parents e4e5589 + c32589b
commit 8bdb284
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+# 1.9.3
+* Fix loki target messages for labels with dots
+
 # 1.9.2
 * Add additional egress rules to kyvernoPlugin and UI subchart with `networkPolicy.egress`
 

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 GO ?= go
 BUILD ?= build
 REPO ?= fjogeleit/policy-reporter
-IMAGE_TAG ?= 1.8.5
+IMAGE_TAG ?= 1.8.6
 LD_FLAGS="-s -w"
 
 all: build

diff --git a/charts/policy-reporter/Chart.yaml b/charts/policy-reporter/Chart.yaml
@@ -5,8 +5,8 @@ description: |
   It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord
 
 type: application
-version: 1.9.2
-appVersion: 1.8.5
+version: 1.9.3
+appVersion: 1.8.6
 
 dependencies:
   - name: monitoring

diff --git a/charts/policy-reporter/values.yaml b/charts/policy-reporter/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: fjogeleit/policy-reporter
   pullPolicy: IfNotPresent
-  tag: 1.8.5
+  tag: 1.8.6
 
 imagePullSecrets: []
 

diff --git a/manifest/default-policy-reporter-ui/install.yaml b/manifest/default-policy-reporter-ui/install.yaml
@@ -148,7 +148,7 @@ spec:
       automountServiceAccountToken: true
       containers:
         - name: policy-reporter
-          image: "fjogeleit/policy-reporter:1.8.5"
+          image: "fjogeleit/policy-reporter:1.8.6"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/manifest/kyverno-policy-reporter-ui/install.yaml b/manifest/kyverno-policy-reporter-ui/install.yaml
@@ -266,7 +266,7 @@ spec:
       automountServiceAccountToken: true
       containers:
         - name: policy-reporter
-          image: "fjogeleit/policy-reporter:1.8.5"
+          image: "fjogeleit/policy-reporter:1.8.6"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/manifest/policy-reporter/install.yaml b/manifest/policy-reporter/install.yaml
@@ -84,7 +84,7 @@ spec:
       automountServiceAccountToken: true
       containers:
         - name: policy-reporter
-          image: "fjogeleit/policy-reporter:1.8.5"
+          image: "fjogeleit/policy-reporter:1.8.6"
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/pkg/target/loki/loki.go b/pkg/target/loki/loki.go
@@ -65,7 +65,7 @@ func newLokiPayload(result report.Result) payload {
 	}
 
 	for property, value := range result.Properties {
-		labels = append(labels, property+"=\""+strings.ReplaceAll(value, "\"", "")+"\"")
+		labels = append(labels, strings.ReplaceAll(property, ".", "_")+"=\""+strings.ReplaceAll(value, "\"", "")+"\"")
 	}
 
 	ls.Labels = "{" + strings.Join(labels, ",") + "}"