make promtail daemonset name configurable

also adding a regex test for something else I was working on
grafana · Sep 16, 2019 · 04a615a · 04a615a
1 parent f918aa0
commit 04a615a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/pkg/logentry/stages/regex_test.go b/pkg/logentry/stages/regex_test.go
@@ -252,6 +252,16 @@ func TestRegexParser_Parse(t *testing.T) {
 				"protocol": "unknown",
 			},
 		},
+		"case insensitive": {
+			map[string]interface{}{
+				"expression": "(?i)(?P<bad>panic:|core_dumped|failure|error|attack| bad |illegal |denied|refused|unauthorized|fatal|failed|Segmentation Fault|Corrupted)",
+			},
+			map[string]interface{}{},
+			"A Terrible Error has occurred!!!",
+			map[string]interface{}{
+				"bad": "Error",
+			},
+		},
 		"missing extracted[source]": {
 			map[string]interface{}{
 				"expression": "^HTTP\\/(?P<protocol_version>.*)$",

diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet
@@ -20,5 +20,6 @@
     },
     promtail_cluster_role_name: 'promtail',
     promtail_configmap_name: 'promtail',
+    promtail_pod_name: 'promtail',
   },
 }
diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet
@@ -33,7 +33,7 @@ k + config + scrape_config {
   local configMap = $.core.v1.configMap,
 
   promtail_config_map:
-    configMap.new('promtail') +
+    configMap.new($._config.promtail_configmap_name) +
     configMap.withData({
       'promtail.yml': $.util.manifestYaml($.promtail_config),
     }),
@@ -61,7 +61,7 @@ k + config + scrape_config {
   local daemonSet = $.extensions.v1beta1.daemonSet,
 
   promtail_daemonset:
-    daemonSet.new('promtail', [$.promtail_container]) +
+    daemonSet.new($._config.promtail_pod_name, [$.promtail_container]) +
     daemonSet.mixin.spec.template.spec.withServiceAccount($._config.promtail_cluster_role_name) +
     $.util.configVolumeMount($._config.promtail_configmap_name, '/etc/promtail') +
     $.util.hostVolumeMount('varlog', '/var/log', '/var/log') +