fix flaky static converter test (#5247)

* fix flaky testing Signed-off-by: erikbaranowski <[email protected]> * shuffle windows test output order to match --------- Signed-off-by: erikbaranowski <[email protected]>
grafana · Sep 19, 2023 · 9a3162f · 9a3162f
1 parent 23dfab9
commit 9a3162f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 21 deletions.
diff --git a/converter/internal/staticconvert/testdata/prom_scrape.river b/converter/internal/staticconvert/testdata/prom_scrape.river
@@ -124,18 +124,5 @@ http {
 		key_file         = "./testdata/example-key.pem"
 		client_ca_file   = "./testdata/example-cert.pem"
 		client_auth_type = "VerifyClientCertIfGiven"
-
-		windows_certificate_filter {
-			server {
-				store            = "something"
-				refresh_interval = "0s"
-			}
-
-			client {
-				issuer_common_names = ["1"]
-				subject_regex       = "2"
-				template_id         = "something2"
-			}
-		}
 	}
 }
diff --git a/converter/internal/staticconvert/testdata/prom_scrape.yaml b/converter/internal/staticconvert/testdata/prom_scrape.yaml
@@ -6,14 +6,6 @@ server:
     cert_file: "./testdata/example-cert.pem"
     key_file: "./testdata/example-key.pem"
     client_auth_type: "VerifyClientCertIfGiven"
-    windows_certificate_filter:
-        server:
-          store: "something"
-        client:
-          issuer_common_names:
-            - "1"
-          subject_regex: "2"
-          template_id: "something2"
 
 metrics:
   wal_directory: /home/pi/Projects/agent/agentwal

diff --git a/converter/internal/staticconvert/testdata_windows/integrations.river b/converter/internal/staticconvert/testdata_windows/integrations.river
@@ -1,3 +1,27 @@
+logging {
+	level  = "debug"
+	format = "json"
+}
+
+http {
+	tls {
+		client_auth_type = "VerifyClientCertIfGiven"
+
+		windows_certificate_filter {
+			server {
+				store            = "something"
+				refresh_interval = "0s"
+			}
+
+			client {
+				issuer_common_names = ["1"]
+				subject_regex       = "2"
+				template_id         = "something2"
+			}
+		}
+	}
+}
+
 prometheus.exporter.windows "integrations_windows_exporter" {
 	enabled_collectors = ["cpu", "cs", "logical_disk", "net", "os", "service", "system"]
 

diff --git a/converter/internal/staticconvert/testdata_windows/integrations.yaml b/converter/internal/staticconvert/testdata_windows/integrations.yaml
@@ -1,3 +1,17 @@
+server:
+  log_level: debug
+  log_format: json
+  http_tls_config:
+    client_auth_type: "VerifyClientCertIfGiven"
+    windows_certificate_filter:
+        server:
+          store: "something"
+        client:
+          issuer_common_names:
+            - "1"
+          subject_regex: "2"
+          template_id: "something2"
+
 metrics:
   global:
     remote_write: