use customfields in prometheus

Signed-off-by: Jeremy Mill <jeremymill@gmail.com>

README.md

@@ -173,11 +173,6 @@ customfields: # custom fields are added to falco events
   Ckey: "CValue"
 mutualtlsfilespath: "/etc/certs" # folder which will used to store client.crt, client.key and ca.crt files for mutual tls (default: "/etc/certs")
 
-customprometheus: # custom labels to add to prometheus
-  Akey: "AValue"
-  Bkey: "BValue"
-  Ckey: "CValue"
-
 slack:
   webhookurl: "" # Slack WebhookURL (ex: https://hooks.slack.com/services/XXXX/YYYY/ZZZZ), if not empty, Slack output is enabled
   #footer: "" # Slack footer

config.go

@@ -19,10 +19,9 @@ import (
 
 func getConfig() *types.Configuration {
 	c := &types.Configuration{
-		Customfields:     make(map[string]string),
-		CustomPrometheus: make(map[string]string),
-		Webhook:          types.WebhookOutputConfig{CustomHeaders: make(map[string]string)},
-		CloudEvents:      types.CloudEventsOutputConfig{Extensions: make(map[string]string)},
+		Customfields: make(map[string]string),
+		Webhook:      types.WebhookOutputConfig{CustomHeaders: make(map[string]string)},
+		CloudEvents:  types.CloudEventsOutputConfig{Extensions: make(map[string]string)},
 	}
 
 	configFile := kingpin.Flag("config-file", "config file").Short('c').ExistingFile()
@@ -328,7 +327,6 @@ func getConfig() *types.Configuration {
 	}
 
 	v.GetStringMapString("customfields")
-	v.GetStringMapString("customprometheus")
 	v.GetStringMapString("Webhook.CustomHeaders")
 	v.GetStringMapString("CloudEvents.Extensions")
 	if err := v.Unmarshal(c); err != nil {
@@ -345,16 +343,6 @@ func getConfig() *types.Configuration {
 		}
 	}
 
-	if value, present := os.LookupEnv("CUSTOMPROMETHEUS"); present {
-		customprometheus := strings.Split(value, ",")
-		for _, label := range customprometheus {
-			tagkeys := strings.Split(label, ":")
-			if len(tagkeys) == 2 {
-				c.CustomPrometheus[tagkeys[0]] = tagkeys[1]
-			}
-		}
-	}
-
 	if value, present := os.LookupEnv("WEBHOOK_CUSTOMHEADERS"); present {
 		customfields := strings.Split(value, ",")
 		for _, label := range customfields {

config_example.yaml

@@ -5,10 +5,6 @@ customfields: # custom fields are added to falco events
   Akey: "AValue"
   Bkey: "BValue"
   Ckey: "CValue"
-customprometheus: # custom labels to add to prometheus
-  Akey: "AValue"
-  Bkey: "BValue"
-  Ckey: "CValue"
 mutualtlsfilespath: "/etc/certs" # folder which will used to store client.crt, client.key and ca.crt files for mutual tls (default: "/etc/certs")
 
 slack:

handlers.go

@@ -107,7 +107,7 @@ func newFalcoPayload(payload io.Reader) (types.FalcoPayload, error) {
 	nullClient.CountMetric("falco.accepted", 1, []string{"priority:" + falcopayload.Priority.String()})
 	stats.Falco.Add(strings.ToLower(falcopayload.Priority.String()), 1)
 	promLabels := map[string]string{"rule": falcopayload.Rule, "priority": falcopayload.Priority.String(), "k8s_ns_name": kn, "k8s_pod_name": kp}
-	for key, value := range config.CustomPrometheus {
+	for key, value := range config.Customfields {
 		promLabels[key] = value
 	}
 	promStats.Falco.With(promLabels).Inc()

stats_prometheus.go

@@ -41,7 +41,7 @@ func getFalcoNewCounterVec(config *types.Configuration) *prometheus.CounterVec {
 		"k8s_ns_name",
 		"k8s_pod_name",
 	}
-	for key := range config.CustomPrometheus {
+	for key := range config.Customfields {
 		labelnames = append(labelnames, key)
 	}
 	return promauto.NewCounterVec(

types/types.go

@@ -25,7 +25,6 @@ type Configuration struct {
 	ListenAddress      string
 	ListenPort         int
 	Customfields       map[string]string
-	CustomPrometheus   map[string]string
 	Slack              SlackOutputConfig
 	Cliq               CliqOutputConfig
 	Mattermost         MattermostOutputConfig