code clean

Signed-off-by: Weifeng Wang <qclaogui@gmail.com>
qclaogui · Mar 14, 2024 · 2531430 · 2531430
1 parent a035789
commit 2531430
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 77 deletions.
diff --git a/docker-compose/common/config/agent-flow/logs.river b/docker-compose/common/config/agent-flow/logs.river
@@ -1,7 +1,7 @@
 // https://github.com/grafana/agent-configurator
 
 logging {
-	level  = "info"
+	level  = coalesce(env("AGENT_LOG_LEVEL"), "info")
 	format = "logfmt"
 }
 
@@ -10,7 +10,7 @@ logging {
  ********************************************/
 
 module.file "docker_compose" {
-	filename = env("AGENT_CONFIG_FOLDER") + "/modules/docker_compose.river"
+	filename = coalesce(env("AGENT_CONFIG_FOLDER"), "/etc/agent-config") + "/modules/docker_compose.river"
 
 	arguments {
 		logs_endpoint = "http://gateway:3100"

diff --git a/docker-compose/common/config/agent-flow/metrics.river b/docker-compose/common/config/agent-flow/metrics.river
@@ -1,7 +1,7 @@
 // https://github.com/grafana/agent-configurator
 
 logging {
-	level  = "warn"
+	level  = coalesce(env("AGENT_LOG_LEVEL"), "info")
 	format = "logfmt"
 }
 

diff --git a/docker-compose/common/config/agent-flow/monolithic-mode-all.river b/docker-compose/common/config/agent-flow/monolithic-mode-all.river
@@ -1,7 +1,7 @@
 // https://github.com/grafana/agent-configurator
 
 logging {
-	level  = "info"
+	level  = coalesce(env("AGENT_LOG_LEVEL"), "info")
 	format = "logfmt"
 }
 

diff --git a/docker-compose/common/config/agent-flow/profiles.river b/docker-compose/common/config/agent-flow/profiles.river
@@ -1,12 +1,16 @@
 // https://github.com/grafana/agent-configurator
 
 logging {
-	level  = "warn"
+	level  = coalesce(env("AGENT_LOG_LEVEL"), "info")
 	format = "logfmt"
 }
 
+/********************************************
+ * LGTMP Receiver provider
+ ********************************************/
+
 module.file "docker_compose" {
-	filename = env("AGENT_CONFIG_FOLDER") + "/modules/docker_compose.river"
+	filename = coalesce(env("AGENT_CONFIG_FOLDER"), "/etc/agent-config") + "/modules/docker_compose.river"
 
 	arguments {
 		profiles_endpoint = "http://gateway:4040"

diff --git a/docker-compose/common/config/agent-flow/traces.river b/docker-compose/common/config/agent-flow/traces.river
@@ -1,7 +1,7 @@
 // https://github.com/grafana/agent-configurator
 
 logging {
-	level  = "warn"
+	level  = coalesce(env("AGENT_LOG_LEVEL"), "info")
 	format = "logfmt"
 }
 
@@ -10,90 +10,30 @@ tracing {
 	write_to          = [otelcol.processor.batch.containers.input]
 }
 
+/********************************************
+ * LGTMP Receiver provider
+ ********************************************/
+
 module.file "docker_compose" {
-	filename = env("AGENT_CONFIG_FOLDER") + "/modules/docker_compose.river"
+	filename = coalesce(env("AGENT_CONFIG_FOLDER"), "/etc/agent-config") + "/modules/docker_compose.river"
 
 	arguments {
 		metrics_endpoint = "http://gateway:8080"
 		traces_endpoint  = "gateway:4317"
 	}
 }
 
-discovery.relabel "containers" {
-	targets = module.file.docker_compose.exports.relabelings_common.output
-}
-
 /********************************************
  * Metrics
  ********************************************/
 
-prometheus.exporter.unix "containers" {
-	set_collectors     = ["cpu"]
-	disable_collectors = ["diskstats", "mdadm", "textfile", "hwmon"]
-}
-
-prometheus.scrape "integrations" {
-	targets = concat(
-		prometheus.exporter.unix.containers.targets,
-	)
-	scrape_interval = "15s"
-
-	enable_protobuf_negotiation = true
-	scrape_classic_histograms   = true
-
-	clustering {
-		enabled = true
-	}
-
-	forward_to = [prometheus.relabel.integrations.receiver]
-}
-
-prometheus.scrape "containers" {
-	targets         = discovery.relabel.containers.output
-	scrape_interval = "15s"
-
-	enable_protobuf_negotiation = true
-	scrape_classic_histograms   = true
-
-	clustering {
-		enabled = true
-	}
+module.file "metrics_primary" {
+	filename = coalesce(env("AGENT_CONFIG_FOLDER"), "/etc/agent-config") + "/modules/docker/metrics/all.river"
 
-	forward_to = [module.file.docker_compose.exports.metrics_receiver]
-}
-
-prometheus.scrape "minio" {
-	targets = [{"__address__" = "minio:9000", "job" = "minio-job"}]
-
-	scrape_interval = "15s"
-
-	enable_protobuf_negotiation = true
-	scrape_classic_histograms   = true
-
-	clustering {
-		enabled = true
-	}
-	metrics_path = "/minio/v2/metrics/cluster"
-
-	forward_to = [prometheus.relabel.integrations.receiver]
-}
-
-prometheus.relabel "integrations" {
-	rule {
-		source_labels = ["job"]
-		regex         = "(integrations|monitoring-system)/(.*)"
-		target_label  = "pod"
-		replacement   = "${2}"
-	}
-
-	rule {
-		source_labels = ["job"]
-		regex         = "(integrations|monitoring-system)/(.*)"
-		target_label  = "container"
-		replacement   = "${2}"
+	arguments {
+		forward_to = [module.file.docker_compose.exports.metrics_receiver]
+		clustering = true
 	}
-
-	forward_to = [module.file.docker_compose.exports.metrics_receiver]
 }
 
 /********************************************