Merge branch 'main' into patch-1

README.md

@@ -1,16 +1,15 @@
-# Flow Modules
+# Alloy Modules
 
 <!-- markdownlint-disable MD033 -->
 <a href="https://grafana.com">
   <img height="20" src="https://img.shields.io/badge/grafana-%23F46800.svg?style=for-the-badge&logo=grafana&logoColor=white" alt="Grafana" />
 </a>
 
 <p align="center">
-    <img src="assets/logo_alloy_dark.svg" alt="Grafana Alloy logo" height="100px">
+    <img src="assets/logo_alloy_light.svg#gh-dark-mode-only" alt="Grafana Alloy logo" height="100px">
+    <img src="assets/logo_alloy_dark.svg#gh-light-mode-only" alt="Grafana Alloy logo" height="100px">
 </p>
 
-**NOTE: This is only to be used for Modules not Modules Classic.**
-
 [Modules](https://grafana.com/docs/alloy/latest/concepts/modules/) are a way to create Grafana [Alloy](https://grafana.com/docs/alloy/latest/) configurations which can be loaded as a component. Modules are a great way to parameterize a configuration to create reusable pipelines.
 
 ## Submitting modules
@@ -19,7 +18,7 @@ Create a folder for the module under the `./modules` directory in the appropriat
 
 -   Components
 -   Brief description
--   Applicable Agent Versions
+-   Applicable Alloy versions
 -   Declare arguments and exports
 -   Example
 

modules/kubernetes/kube-state-metrics/metrics.alloy

@@ -50,7 +50,7 @@ declare "kubernetes" {
 
   // kube-state-metrics relabelings (pre-scrape)
   discovery.relabel "ksm" {
-    targets = discovery.kubernetes.kube_state_metrics.targets
+    targets = discovery.kubernetes.ksm.targets
 
     // only keep targets with a matching port name
     rule {
@@ -121,7 +121,7 @@ declare "scrape" {
   prometheus.scrape "kube_state_metrics" {
     job_name = coalesce(argument.job_label.value, "integrations/kubernetes/kube-state-metrics")
     forward_to = [prometheus.relabel.kube_state_metrics.receiver]
-    targets = discovery.relabel.kube_state_metrics.output
+    targets = argument.targets.value
     scrape_interval = coalesce(argument.scrape_interval.value, "60s")
     scrape_timeout = coalesce(argument.scrape_timeout.value, "10s")