diff --git a/charts/k8s-monitoring/charts/feature-integrations/docs/integrations/grafana.md b/charts/k8s-monitoring/charts/feature-integrations/docs/integrations/grafana.md
index c03ff7bd8..8f61c6d63 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/docs/integrations/grafana.md
+++ b/charts/k8s-monitoring/charts/feature-integrations/docs/integrations/grafana.md
@@ -7,7 +7,7 @@
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | fieldSelectors | list | `[]` | Discover Grafana instances based on field selectors. |
-| labelSelectors | object | `{}` | Discover Grafana instances based on label selectors. |
+| labelSelectors | object | `{"app.kubernetes.io/name":"grafana"}` | Discover Grafana instances based on label selectors. |
 | metrics.portName | string | `"grafana"` | Name of the port to scrape metrics from. |
 | namespaces | list | `[]` | The namespaces to look for Grafana instances in. Will automatically look for Grafana instances in all namespaces unless specified here |
 
diff --git a/charts/k8s-monitoring/charts/feature-integrations/docs/integrations/loki.md b/charts/k8s-monitoring/charts/feature-integrations/docs/integrations/loki.md
index ec3a5dd72..46bf3411e 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/docs/integrations/loki.md
+++ b/charts/k8s-monitoring/charts/feature-integrations/docs/integrations/loki.md
@@ -7,17 +7,10 @@
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | fieldSelectors | list | `[]` | Discover Loki instances based on field selectors. |
-| labelSelectors | object | `{}` | Discover Loki instances based on label selectors. |
+| labelSelectors | object | `{"app.kubernetes.io/name":["loki","enterprise-logs"]}` | Discover Loki instances based on label selectors. |
 | metrics.portName | string | `"http-metrics"` | Name of the port to scrape metrics from. |
 | namespaces | list | `[]` | Namespaces to look for Loki instances in. Will automatically look for Loki instances in all namespaces unless specified here |
 
-### General Settings
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| jobLabel | string | `"integrations/loki"` | The value of the job label for scraped metrics and logs |
-| name | string | `""` | Name for this Loki instance. |
-
 ### Logs Settings
 
 | Key | Type | Default | Description |
@@ -49,3 +42,9 @@
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | metrics.scrapeInterval | string | `60s` | How frequently to scrape metrics from Loki. |
+
+### General Settings
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| name | string | `""` | Name for this Loki instance. |
diff --git a/charts/k8s-monitoring/charts/feature-integrations/integrations/grafana-values.yaml b/charts/k8s-monitoring/charts/feature-integrations/integrations/grafana-values.yaml
index d39edc922..b6472e4df 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/integrations/grafana-values.yaml
+++ b/charts/k8s-monitoring/charts/feature-integrations/integrations/grafana-values.yaml
@@ -18,7 +18,8 @@ fieldSelectors: []
 
 # -- Discover Grafana instances based on label selectors.
 # @section -- Discovery Settings
-labelSelectors: {}
+labelSelectors:
+  app.kubernetes.io/name: grafana
 
 # Settings for metrics collection
 metrics:
diff --git a/charts/k8s-monitoring/charts/feature-integrations/integrations/loki-values.yaml b/charts/k8s-monitoring/charts/feature-integrations/integrations/loki-values.yaml
index ecaced09e..10c342cd9 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/integrations/loki-values.yaml
+++ b/charts/k8s-monitoring/charts/feature-integrations/integrations/loki-values.yaml
@@ -3,10 +3,6 @@
 # @section -- General Settings
 name: ""
 
-# -- The value of the job label for scraped metrics and logs
-# @section -- General Settings
-jobLabel: integrations/loki
-
 # -- Namespaces to look for Loki instances in.
 # Will automatically look for Loki instances in all namespaces unless specified here
 # @section -- Discovery Settings
@@ -18,7 +14,8 @@ fieldSelectors: []
 
 # -- Discover Loki instances based on label selectors.
 # @section -- Discovery Settings
-labelSelectors: {}
+labelSelectors:
+  app.kubernetes.io/name: [loki, enterprise-logs]
 
 # Settings for metrics collection
 metrics:
diff --git a/charts/k8s-monitoring/charts/feature-integrations/schema-mods/definitions/grafana-integration.schema.json b/charts/k8s-monitoring/charts/feature-integrations/schema-mods/definitions/grafana-integration.schema.json
index f3c7c1ac3..1d0313bb2 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/schema-mods/definitions/grafana-integration.schema.json
+++ b/charts/k8s-monitoring/charts/feature-integrations/schema-mods/definitions/grafana-integration.schema.json
@@ -8,7 +8,12 @@
             "type": "string"
         },
         "labelSelectors": {
-            "type": "object"
+            "type": "object",
+            "properties": {
+                "app.kubernetes.io/name": {
+                    "type": "string"
+                }
+            }
         },
         "logs": {
             "type": "object",
diff --git a/charts/k8s-monitoring/charts/feature-integrations/schema-mods/definitions/loki-integration.schema.json b/charts/k8s-monitoring/charts/feature-integrations/schema-mods/definitions/loki-integration.schema.json
index 6fce2cf65..e8f738f86 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/schema-mods/definitions/loki-integration.schema.json
+++ b/charts/k8s-monitoring/charts/feature-integrations/schema-mods/definitions/loki-integration.schema.json
@@ -4,11 +4,16 @@
         "fieldSelectors": {
             "type": "array"
         },
-        "jobLabel": {
-            "type": "string"
-        },
         "labelSelectors": {
-            "type": "object"
+            "type": "object",
+            "properties": {
+                "app.kubernetes.io/name": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
         },
         "logs": {
             "type": "object",
diff --git a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_grafana_logs.tpl b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_grafana_logs.tpl
index e0c7f5363..890ef6732 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_grafana_logs.tpl
+++ b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_grafana_logs.tpl
@@ -19,28 +19,28 @@
         {{- $valueList := list }}
         {{- if .namespaces }}
           {{- $labelList = append $labelList "__meta_kubernetes_namespace" -}}
-          {{- $valueList = append $valueList (printf "(%s)" (join "|" .namespaces)) -}}
+          {{- $valueList = append $valueList (printf "(?:%s)" (join "|" .namespaces)) -}}
         {{- end }}
         {{- range $k, $v := .labelSelectors }}
           {{- if kindIs "slice" $v }}
             {{- $labelList = append $labelList (include "pod_label" $k) -}}
-            {{- $valueList = append $valueList (printf "(%s)" (join "|" $v)) -}}
+            {{- $valueList = append $valueList (printf "(?:%s)" (join "|" $v)) -}}
           {{- else }}
             {{- $labelList = append $labelList (include "pod_label" $k) -}}
-            {{- $valueList = append $valueList $v -}}
+            {{- $valueList = append $valueList (printf "(?:%s)" $v) -}}
           {{- end }}
         {{- end }}
 rule {
-  source_labels = {{ $labelList | sortAlpha | toJson }}
+  source_labels = {{ $labelList | toJson }}
   separator = ";"
-  regex = {{ $valueList | sortAlpha | join ";" | quote }}
+  regex = {{ $valueList | join ";" | quote }}
   target_label = "job"
   replacement = "integrations/grafana"
 }
 rule {
-  source_labels = {{ $labelList | sortAlpha | toJson }}
+  source_labels = {{ $labelList | toJson }}
   separator = ";"
-  regex = {{ $valueList | sortAlpha | join ";" | quote }}
+  regex = {{ $valueList | join ";" | quote }}
   target_label = "instance"
   replacement = {{ $instance.name | quote }}
 }
diff --git a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_loki_logs.tpl b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_loki_logs.tpl
index f195fdcf5..6de3bd29e 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_loki_logs.tpl
+++ b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_loki_logs.tpl
@@ -19,30 +19,43 @@
         {{- $valueList := list }}
         {{- if .namespaces }}
           {{- $labelList = append $labelList "__meta_kubernetes_namespace" -}}
-          {{- $valueList = append $valueList (printf "(%s)" (join "|" .namespaces)) -}}
+          {{- $valueList = append $valueList (printf "(?:%s)" (join "|" .namespaces)) -}}
         {{- end }}
         {{- range $k, $v := .labelSelectors }}
           {{- if kindIs "slice" $v }}
             {{- $labelList = append $labelList (include "pod_label" $k) -}}
-            {{- $valueList = append $valueList (printf "(%s)" (join "|" $v)) -}}
+            {{- $valueList = append $valueList (printf "(?:%s)" (join "|" $v)) -}}
           {{- else }}
             {{- $labelList = append $labelList (include "pod_label" $k) -}}
-            {{- $valueList = append $valueList $v -}}
+            {{- $valueList = append $valueList (printf "(?:%s)" $v) -}}
           {{- end }}
         {{- end }}
+// add static label of integration="loki" and instance="name" to pods that match the selector so they can be identified in the loki.process stages
 rule {
-  source_labels = {{ $labelList | sortAlpha | toJson }}
+  source_labels = {{ $labelList | toJson }}
   separator = ";"
-  regex = {{ $valueList | sortAlpha | join ";" | quote }}
-  target_label = "job"
-  replacement = "integrations/loki"
+  regex = {{ $valueList | join ";" | quote }}
+  target_label = "integration"
+  replacement = "loki"
 }
 rule {
-  source_labels = {{ $labelList | sortAlpha | toJson }}
+  source_labels = {{ $labelList | toJson }}
   separator = ";"
-  regex = {{ $valueList | sortAlpha | join ";" | quote }}
+  regex = {{ $valueList | join ";" | quote }}
   target_label = "instance"
   replacement = {{ $instance.name | quote }}
+}
+{{- $labelList = append $labelList "__meta_kubernetes_namespace" -}}
+{{- $valueList = append $valueList "([^;]+)" -}}
+{{- $labelList = append $labelList (include "pod_label" "component") -}}
+{{- $valueList = append $valueList "([^;]+)" }}
+// override the job label to be namespace/component so it aligns to the loki-mixin
+rule {
+  source_labels = {{ $labelList | toJson }}
+  separator = ";"
+  regex = {{ $valueList | join ";" | quote }}
+  target_label = "job"
+  replacement = "$1/$2"
 }
       {{- end }}
     {{- end }}
@@ -58,9 +71,9 @@ rule {
         {{- if .logs.enabled }}
 stage.match {
   {{- if $instance.namespaces }}
-  selector = "{job=\"integrations/loki\",instance=\"{{ $instance.name }}\",namespace=~\"{{ $instance.namespaces | join "|" }}\"}"
+  selector = "{integration=\"loki\",instance=\"{{ $instance.name }}\",namespace=~\"{{ $instance.namespaces | join "|" }}\"}"
   {{- else }}
-  selector = "{job=\"integrations/loki\",instance=\"{{ $instance.name }}\"}"
+  selector = "{integration=\"loki\",instance=\"{{ $instance.name }}\"}"
   {{- end }}
 
   // extract some of the fields from the log line
diff --git a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_loki_metrics.tpl b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_loki_metrics.tpl
index d2d90d315..a8a18e58e 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_loki_metrics.tpl
+++ b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_loki_metrics.tpl
@@ -74,6 +74,13 @@ declare "loki_integration" {
         action = "keep"
       }
 
+      // the loki-mixin expects the job label to be namespace/component
+      rule {
+        source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_component"]
+        separator = "/"
+        target_label = "job"
+      }
+
       {{ include "commonRelabelings" . | nindent 4 }}
     }
 
@@ -140,9 +147,36 @@ declare "loki_integration" {
       // drop metrics that match the drop_metrics regex
       rule {
         source_labels = ["__name__"]
-        regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)")
+        regex = coalesce(argument.drop_metrics.value, "")
         action = "drop"
       }
+
+      // keep only metrics that match the keep_metrics regex
+      rule {
+        source_labels = ["__name__"]
+        regex = coalesce(argument.keep_metrics.value, "(.+)")
+        action = "keep"
+      }
+
+      // the loki-mixin expects the instance label to be the node name
+      rule {
+        source_labels = ["node"]
+        target_label = "instance"
+        replacement = "$1"
+      }
+      rule {
+        action = "labeldrop"
+        regex = "node"
+      }
+
+      // set the memcached exporter container name from container="exporter" to container="memcached"
+      rule {
+        source_labels = ["component", "container"]
+        separator = ";"
+        regex = "memcached-[^;]+;exporter"
+        target_label = "container"
+        replacement = "memcached"
+      }
     }
   }
   {{- range $instance := $.Values.loki.instances }}
@@ -177,7 +211,7 @@ loki_integration_discovery {{ include "helper.alloy_name" .name | quote }} {
 
 loki_integration_scrape  {{ include "helper.alloy_name" .name | quote }} {
   targets = loki_integration_discovery.{{ include "helper.alloy_name" .name }}.output
-  job_label = {{ .jobLabel | quote }}
+  job_label = "integrations/loki"
   clustering = true
 {{- if $metricAllowList }}
   keep_metrics = {{ $metricAllowList | join "|" | quote }}
diff --git a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_mysql_logs.tpl b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_mysql_logs.tpl
index 2ddad7091..4c9d52aa4 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_mysql_logs.tpl
+++ b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_mysql_logs.tpl
@@ -17,28 +17,28 @@
       {{- $valueList := list }}
       {{- if .logs.namespaces }}
         {{- $labelList = append $labelList "__meta_kubernetes_namespace" -}}
-        {{- $valueList = append $valueList (printf "(%s)" (join "|" .logs.namespaces)) -}}
+        {{- $valueList = append $valueList (printf "(?:%s)" (join "|" .logs.namespaces)) -}}
       {{- end }}
       {{- range $k, $v := .logs.labelSelectors }}
         {{- if kindIs "slice" $v }}
           {{- $labelList = append $labelList (include "pod_label" $k) -}}
-          {{- $valueList = append $valueList (printf "(%s)" (join "|" $v)) -}}
+          {{- $valueList = append $valueList (printf "(?:%s)" (join "|" $v)) -}}
         {{- else }}
           {{- $labelList = append $labelList (include "pod_label" $k) -}}
-          {{- $valueList = append $valueList $v -}}
+          {{- $valueList = append $valueList (printf "(?:%s)" $v) -}}
         {{- end }}
       {{- end }}
 rule {
-  source_labels = {{ $labelList | sortAlpha | toJson }}
+  source_labels = {{ $labelList | toJson }}
   separator = ";"
-  regex = {{ $valueList | sortAlpha | join ";" | quote }}
+  regex = {{ $valueList | join ";" | quote }}
   target_label = "integration"
   replacement = "mysql"
 }
 rule {
-  source_labels = {{ $labelList | sortAlpha | toJson }}
+  source_labels = {{ $labelList | toJson }}
   separator = ";"
-  regex = {{ $valueList | sortAlpha | join ";" | quote }}
+  regex = {{ $valueList | join ";" | quote }}
   target_label = "instance"
   replacement = {{ $instance.name | quote }}
 }
diff --git a/charts/k8s-monitoring/charts/feature-integrations/tests/grafana_logs_test.yaml b/charts/k8s-monitoring/charts/feature-integrations/tests/grafana_logs_test.yaml
index fca0fb872..afd1ab9e7 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/tests/grafana_logs_test.yaml
+++ b/charts/k8s-monitoring/charts/feature-integrations/tests/grafana_logs_test.yaml
@@ -23,14 +23,14 @@ tests:
               rule {
                 source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
                 separator = ";"
-                regex = "grafana"
+                regex = "(?:grafana)"
                 target_label = "job"
                 replacement = "integrations/grafana"
               }
               rule {
                 source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
                 separator = ";"
-                regex = "grafana"
+                regex = "(?:grafana)"
                 target_label = "instance"
                 replacement = "grafana"
               }
@@ -84,7 +84,22 @@ tests:
           of: ConfigMap
       - matchRegex:
           path: data["logs.alloy"]
-          pattern: namespace=~\\"k8smon\\"
+          # The pattern should look like this, but since the regex is escaped, it will be a bit different
+          # rule {
+          #   source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+          #   separator = ";"
+          #   regex = "(?:k8smon);(?:grafana)"
+          #   target_label = "job"
+          #   replacement = "integrations/grafana"
+          # }
+          pattern: |-
+            \s*rule {
+            \s*  source_labels = \["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"\]
+            \s*  separator = ";"
+            \s*  regex = "\(\?:k8smon\)\;\(\?:grafana\)"
+            \s*  target_label = "job"
+            \s*  replacement = "integrations/grafana"
+            \s*}
 
   - it: should allow you to set the timestamp format
     set:
diff --git a/charts/k8s-monitoring/charts/feature-integrations/tests/loki_logs_test.yaml b/charts/k8s-monitoring/charts/feature-integrations/tests/loki_logs_test.yaml
index 394b1c49e..177a42844 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/tests/loki_logs_test.yaml
+++ b/charts/k8s-monitoring/charts/feature-integrations/tests/loki_logs_test.yaml
@@ -20,27 +20,36 @@ tests:
           value: |-
             // Integration rules
             discovery.relabel "test" {
+              // add static label of integration="loki" and instance="name" to pods that match the selector so they can be identified in the loki.process stages
               rule {
                 source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
                 separator = ";"
-                regex = "loki"
-                target_label = "job"
-                replacement = "integrations/loki"
+                regex = "(?:loki)"
+                target_label = "integration"
+                replacement = "loki"
               }
               rule {
                 source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
                 separator = ";"
-                regex = "loki"
+                regex = "(?:loki)"
                 target_label = "instance"
                 replacement = "loki"
               }
+              // override the job label to be namespace/component so it aligns to the loki-mixin
+              rule {
+                source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name","__meta_kubernetes_namespace","__meta_kubernetes_pod_label_component"]
+                separator = ";"
+                regex = "(?:loki);([^;]+);([^;]+)"
+                target_label = "job"
+                replacement = "$1/$2"
+              }
             }
 
             // Processing stages
             loki.process "test" {
               // Integration: Loki
               stage.match {
-                selector = "{job=\"integrations/loki\",instance=\"loki\"}"
+                selector = "{integration=\"loki\",instance=\"loki\"}"
 
                 // extract some of the fields from the log line
                 stage.logfmt {
@@ -85,7 +94,22 @@ tests:
           of: ConfigMap
       - matchRegex:
           path: data["logs.alloy"]
-          pattern: namespace=~\\"k8smon\\"
+          # The pattern should look like this, but since the regex is escaped, it will be a bit different
+          # rule {
+          #   source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+          #   separator = ";"
+          #   regex = "(?:k8smon);(?:loki)"
+          #   target_label = "integration"
+          #   replacement = "loki"
+          # }
+          pattern: |-
+            \s*rule {
+            \s*  source_labels = \["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"\]
+            \s*  separator = ";"
+            \s*  regex = "\(\?:k8smon\)\;\(\?:loki\)"
+            \s*  target_label = "integration"
+            \s*  replacement = "loki"
+            \s*}
 
   - it: should allow you to set the timestamp format
     set:
diff --git a/charts/k8s-monitoring/charts/feature-integrations/tests/loki_metrics_test.yaml b/charts/k8s-monitoring/charts/feature-integrations/tests/loki_metrics_test.yaml
index 1e8e0e87c..d595ec1c0 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/tests/loki_metrics_test.yaml
+++ b/charts/k8s-monitoring/charts/feature-integrations/tests/loki_metrics_test.yaml
@@ -76,6 +76,13 @@ tests:
                     action = "keep"
                   }
 
+                  // the loki-mixin expects the job label to be namespace/component
+                  rule {
+                    source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_component"]
+                    separator = "/"
+                    target_label = "job"
+                  }
+
 
 
                 rule {
@@ -214,9 +221,36 @@ tests:
                   // drop metrics that match the drop_metrics regex
                   rule {
                     source_labels = ["__name__"]
-                    regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)")
+                    regex = coalesce(argument.drop_metrics.value, "")
                     action = "drop"
                   }
+
+                  // keep only metrics that match the keep_metrics regex
+                  rule {
+                    source_labels = ["__name__"]
+                    regex = coalesce(argument.keep_metrics.value, "(.+)")
+                    action = "keep"
+                  }
+
+                  // the loki-mixin expects the instance label to be the node name
+                  rule {
+                    source_labels = ["node"]
+                    target_label = "instance"
+                    replacement = "$1"
+                  }
+                  rule {
+                    action = "labeldrop"
+                    regex = "node"
+                  }
+
+                  // set the memcached exporter container name from container="exporter" to container="memcached"
+                  rule {
+                    source_labels = ["component", "container"]
+                    separator = ";"
+                    regex = "memcached-[^;]+;exporter"
+                    target_label = "container"
+                    replacement = "memcached"
+                  }
                 }
               }
 
diff --git a/charts/k8s-monitoring/charts/feature-integrations/tests/mysql_logs_test.yaml b/charts/k8s-monitoring/charts/feature-integrations/tests/mysql_logs_test.yaml
new file mode 100644
index 000000000..40b4909a7
--- /dev/null
+++ b/charts/k8s-monitoring/charts/feature-integrations/tests/mysql_logs_test.yaml
@@ -0,0 +1,108 @@
+---
+# yamllint disable rule:document-start rule:line-length rule:trailing-spaces rule:empty-lines
+suite: Test MySQL integration
+templates:
+  - configmap.yaml
+tests:
+  - it: should add the   MySQL processing stage to the logs config
+    set:
+      deployAsConfigMap: true
+      mysql:
+        instances:
+          - name: mysql
+            logs:
+              enabled: true
+              labelSelectors:
+                app.kubernetes.io/name: mysql
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: data["logs.alloy"]
+          value: |-
+            // Integration rules
+            discovery.relabel "test" {
+              rule {
+                source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+                separator = ";"
+                regex = "(?:mysql)"
+                target_label = "integration"
+                replacement = "mysql"
+              }
+              rule {
+                source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+                separator = ";"
+                regex = "(?:mysql)"
+                target_label = "instance"
+                replacement = "mysql"
+              }
+            }
+
+            // Processing stages
+            loki.process "test" {
+              // Integration: MySQL
+              stage.match {
+                selector = "{integration=\"mysql\"}"
+
+                stage.regex {
+                  expression = `(?P<timestamp>.+) (?P<thread>[\d]+) \[(?P<label>.+?)\]( \[(?P<err_code>.+?)\] \[(?P<subsystem>.+?)\])? (?P<msg>.+)`
+                }
+
+                stage.labels {
+                  values = {
+                    level = "label",
+                    err_code = "err_code",
+                    subsystem = "subsystem",
+                  }
+                }
+
+                stage.drop {
+                  expression = "^ *$"
+                  drop_counter_reason = "drop empty lines"
+                }
+
+                stage.static_labels {
+                  values = {
+                    job = "integrations/mysql",
+                  }
+                }
+
+                stage.label_drop {
+                  values = ["integration"]
+                }
+              }
+            }
+
+  - it: should allow you to restrict the namespaces for logs
+    set:
+      deployAsConfigMap: true
+      mysql:
+        instances:
+          - name: mysql
+            logs:
+              enabled: true
+              labelSelectors:
+                app.kubernetes.io/name: mysql
+              namespaces:
+                - k8smon
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - matchRegex:
+          path: data["logs.alloy"]
+          # The pattern should look like this, but since the regex is escaped, it will be a bit different
+          # rule {
+          #   source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+          #   separator = ";"
+          #   regex = "(?:k8smon);(?:mysql)"
+          #   target_label = "integration"
+          #   replacement = "mysql"
+          # }
+          pattern: |-
+            \s*rule {
+            \s*  source_labels = \["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"\]
+            \s*  separator = ";"
+            \s*  regex = "\(\?:k8smon\)\;\(\?:mysql\)"
+            \s*  target_label = "integration"
+            \s*  replacement = "mysql"
+            \s*}
diff --git a/charts/k8s-monitoring/charts/feature-integrations/tests/mysql_test.yaml b/charts/k8s-monitoring/charts/feature-integrations/tests/mysql_metrics_test.yaml
similarity index 100%
rename from charts/k8s-monitoring/charts/feature-integrations/tests/mysql_test.yaml
rename to charts/k8s-monitoring/charts/feature-integrations/tests/mysql_metrics_test.yaml
diff --git a/charts/k8s-monitoring/charts/feature-integrations/values.schema.json b/charts/k8s-monitoring/charts/feature-integrations/values.schema.json
index 958add30c..3649488ee 100644
--- a/charts/k8s-monitoring/charts/feature-integrations/values.schema.json
+++ b/charts/k8s-monitoring/charts/feature-integrations/values.schema.json
@@ -307,7 +307,12 @@
                     "type": "string"
                 },
                 "labelSelectors": {
-                    "type": "object"
+                    "type": "object",
+                    "properties": {
+                        "app.kubernetes.io/name": {
+                            "type": "string"
+                        }
+                    }
                 },
                 "logs": {
                     "type": "object",
@@ -383,11 +388,16 @@
                 "fieldSelectors": {
                     "type": "array"
                 },
-                "jobLabel": {
-                    "type": "string"
-                },
                 "labelSelectors": {
                     "type": "object",
+                    "properties": {
+                        "app.kubernetes.io/name": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    },
                     "additionalProperties": {
                         "oneOf": [
                             {
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/grafana/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/grafana/alloy-logs.alloy
index ad635696d..0cb3e1be5 100644
--- a/charts/k8s-monitoring/docs/examples/features/integrations/grafana/alloy-logs.alloy
+++ b/charts/k8s-monitoring/docs/examples/features/integrations/grafana/alloy-logs.alloy
@@ -79,14 +79,14 @@ declare "pod_logs" {
     rule {
       source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
       separator = ";"
-      regex = "(o11y);grafana"
+      regex = "(?:o11y);(?:grafana)"
       target_label = "job"
       replacement = "integrations/grafana"
     }
     rule {
       source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
       separator = ";"
-      regex = "(o11y);grafana"
+      regex = "(?:o11y);(?:grafana)"
       target_label = "instance"
       replacement = "grafana"
     }
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/grafana/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/grafana/output.yaml
index f476f9af1..5c0e81949 100644
--- a/charts/k8s-monitoring/docs/examples/features/integrations/grafana/output.yaml
+++ b/charts/k8s-monitoring/docs/examples/features/integrations/grafana/output.yaml
@@ -455,14 +455,14 @@ data:
         rule {
           source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "(o11y);grafana"
+          regex = "(?:o11y);(?:grafana)"
           target_label = "job"
           replacement = "integrations/grafana"
         }
         rule {
           source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "(o11y);grafana"
+          regex = "(?:o11y);(?:grafana)"
           target_label = "instance"
           replacement = "grafana"
         }
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy
index 4318725be..a053f002e 100644
--- a/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy
+++ b/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-logs.alloy
@@ -76,20 +76,29 @@ declare "pod_logs" {
       action = "labelmap"
       regex = "__meta_kubernetes_pod_annotation_(.+)"
     }
+    // add static label of integration="loki" and instance="name" to pods that match the selector so they can be identified in the loki.process stages
     rule {
       source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
       separator = ";"
-      regex = "loki"
-      target_label = "job"
-      replacement = "integrations/loki"
+      regex = "(?:loki)"
+      target_label = "integration"
+      replacement = "loki"
     }
     rule {
       source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
       separator = ";"
-      regex = "loki"
+      regex = "(?:loki)"
       target_label = "instance"
       replacement = "loki"
     }
+    // override the job label to be namespace/component so it aligns to the loki-mixin
+    rule {
+      source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name","__meta_kubernetes_namespace","__meta_kubernetes_pod_label_component"]
+      separator = ";"
+      regex = "(?:loki);([^;]+);([^;]+)"
+      target_label = "job"
+      replacement = "$1/$2"
+    }
   }
   
   discovery.kubernetes "pods" {
@@ -165,7 +174,7 @@ declare "pod_logs" {
     }
     // Integration: Loki
     stage.match {
-      selector = "{job=\"integrations/loki\",instance=\"loki\"}"
+      selector = "{integration=\"loki\",instance=\"loki\"}"
     
       // extract some of the fields from the log line
       stage.logfmt {
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-metrics.alloy
index 1e7e985e6..081e937f0 100644
--- a/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-metrics.alloy
+++ b/charts/k8s-monitoring/docs/examples/features/integrations/loki/alloy-metrics.alloy
@@ -105,6 +105,13 @@ declare "loki_integration" {
         action = "keep"
       }
 
+      // the loki-mixin expects the job label to be namespace/component
+      rule {
+        source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_component"]
+        separator = "/"
+        target_label = "job"
+      }
+
       
     
     rule {
@@ -243,9 +250,36 @@ declare "loki_integration" {
       // drop metrics that match the drop_metrics regex
       rule {
         source_labels = ["__name__"]
-        regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)")
+        regex = coalesce(argument.drop_metrics.value, "")
         action = "drop"
       }
+
+      // keep only metrics that match the keep_metrics regex
+      rule {
+        source_labels = ["__name__"]
+        regex = coalesce(argument.keep_metrics.value, "(.+)")
+        action = "keep"
+      }
+
+      // the loki-mixin expects the instance label to be the node name
+      rule {
+        source_labels = ["node"]
+        target_label = "instance"
+        replacement = "$1"
+      }
+      rule {
+        action = "labeldrop"
+        regex = "node"
+      }
+
+      // set the memcached exporter container name from container="exporter" to container="memcached"
+      rule {
+        source_labels = ["component", "container"]
+        separator = ";"
+        regex = "memcached-[^;]+;exporter"
+        target_label = "container"
+        replacement = "memcached"
+      }
     }
   }
   
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml
index 1a241c5e2..519b3daf6 100644
--- a/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml
+++ b/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml
@@ -146,6 +146,13 @@ data:
             action = "keep"
           }
     
+          // the loki-mixin expects the job label to be namespace/component
+          rule {
+            source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_component"]
+            separator = "/"
+            target_label = "job"
+          }
+    
           
         
         rule {
@@ -284,9 +291,36 @@ data:
           // drop metrics that match the drop_metrics regex
           rule {
             source_labels = ["__name__"]
-            regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)")
+            regex = coalesce(argument.drop_metrics.value, "")
             action = "drop"
           }
+    
+          // keep only metrics that match the keep_metrics regex
+          rule {
+            source_labels = ["__name__"]
+            regex = coalesce(argument.keep_metrics.value, "(.+)")
+            action = "keep"
+          }
+    
+          // the loki-mixin expects the instance label to be the node name
+          rule {
+            source_labels = ["node"]
+            target_label = "instance"
+            replacement = "$1"
+          }
+          rule {
+            action = "labeldrop"
+            regex = "node"
+          }
+    
+          // set the memcached exporter container name from container="exporter" to container="memcached"
+          rule {
+            source_labels = ["component", "container"]
+            separator = ";"
+            regex = "memcached-[^;]+;exporter"
+            target_label = "container"
+            replacement = "memcached"
+          }
         }
       }
       
@@ -453,20 +487,29 @@ data:
           action = "labelmap"
           regex = "__meta_kubernetes_pod_annotation_(.+)"
         }
+        // add static label of integration="loki" and instance="name" to pods that match the selector so they can be identified in the loki.process stages
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "loki"
-          target_label = "job"
-          replacement = "integrations/loki"
+          regex = "(?:loki)"
+          target_label = "integration"
+          replacement = "loki"
         }
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "loki"
+          regex = "(?:loki)"
           target_label = "instance"
           replacement = "loki"
         }
+        // override the job label to be namespace/component so it aligns to the loki-mixin
+        rule {
+          source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name","__meta_kubernetes_namespace","__meta_kubernetes_pod_label_component"]
+          separator = ";"
+          regex = "(?:loki);([^;]+);([^;]+)"
+          target_label = "job"
+          replacement = "$1/$2"
+        }
       }
       
       discovery.kubernetes "pods" {
@@ -542,7 +585,7 @@ data:
         }
         // Integration: Loki
         stage.match {
-          selector = "{job=\"integrations/loki\",instance=\"loki\"}"
+          selector = "{integration=\"loki\",instance=\"loki\"}"
         
           // extract some of the fields from the log line
           stage.logfmt {
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy
index cdd02027e..a1e850427 100644
--- a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy
+++ b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy
@@ -79,28 +79,28 @@ declare "pod_logs" {
     rule {
       source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
       separator = ";"
-      regex = "staging-db"
+      regex = "(?:staging-db)"
       target_label = "integration"
       replacement = "mysql"
     }
     rule {
       source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
       separator = ";"
-      regex = "staging-db"
+      regex = "(?:staging-db)"
       target_label = "instance"
       replacement = "staging-db"
     }
     rule {
       source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
       separator = ";"
-      regex = "prod-db"
+      regex = "(?:prod-db)"
       target_label = "integration"
       replacement = "mysql"
     }
     rule {
       source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
       separator = ";"
-      regex = "prod-db"
+      regex = "(?:prod-db)"
       target_label = "instance"
       replacement = "prod-db"
     }
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml
index 8da864f63..57ea92870 100644
--- a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml
+++ b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml
@@ -308,28 +308,28 @@ data:
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
           separator = ";"
-          regex = "staging-db"
+          regex = "(?:staging-db)"
           target_label = "integration"
           replacement = "mysql"
         }
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
           separator = ";"
-          regex = "staging-db"
+          regex = "(?:staging-db)"
           target_label = "instance"
           replacement = "staging-db"
         }
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
           separator = ";"
-          regex = "prod-db"
+          regex = "(?:prod-db)"
           target_label = "integration"
           replacement = "mysql"
         }
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
           separator = ";"
-          regex = "prod-db"
+          regex = "(?:prod-db)"
           target_label = "instance"
           replacement = "prod-db"
         }
diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/README.md b/charts/k8s-monitoring/docs/examples/meta-monitoring/README.md
index 9759621ea..c2154754c 100644
--- a/charts/k8s-monitoring/docs/examples/meta-monitoring/README.md
+++ b/charts/k8s-monitoring/docs/examples/meta-monitoring/README.md
@@ -41,11 +41,24 @@ integrations:
       - name: loki
         namespaces:
           - logs
+        labelSelectors:
+          app.kubernetes.io/name: [loki]
+        logs:
+          tuning:
+            # extract logfmt fields and set them as structured metadata
+            structuredMetadata:
+              caller:
+              tenant:
+              org_id:
+              user:
+
   grafana:
     instances:
       - name: grafana
         namespaces:
           - o11y
+        labelSelectors:
+          app.kubernetes.io/name: [grafana]
 
 clusterEvents:
   enabled: true
@@ -83,15 +96,20 @@ clusterMetrics:
     enabled: true
     namespaces:
       - logs
+      - o11y
     extraMetricProcessingRules: |-
       rule {
         action = "keep"
         source_labels = ["namespace"]
         regex = "logs|o11y"
       }
+    metricsTuning:
+      useDefaultAllowList: false
+      includeMetrics: [(.+)]
   node-exporter:
-    enabled: false
-    deploy: false
+    enabled: true
+    useIntegrationAllowList: true
+    deploy: true
   windows-exporter:
     enabled: false
     deploy: false
diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy b/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy
index d296309bc..e9990a908 100644
--- a/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy
+++ b/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy
@@ -188,7 +188,7 @@ declare "cluster_metrics" {
     targets = kube_state_metrics.kubernetes.targets.output
     clustering = true
     job_label = "integrations/kubernetes/kube-state-metrics"
-    keep_metrics = "up|scrape_samples_scraped|kube_configmap_info|kube_configmap_metadata_resource_version|kube_daemonset.*|kube_deployment_metadata_generation|kube_deployment_spec_replicas|kube_deployment_status_condition|kube_deployment_status_observed_generation|kube_deployment_status_replicas_available|kube_deployment_status_replicas_updated|kube_horizontalpodautoscaler_spec_max_replicas|kube_horizontalpodautoscaler_spec_min_replicas|kube_horizontalpodautoscaler_status_current_replicas|kube_horizontalpodautoscaler_status_desired_replicas|kube_job.*|kube_namespace_status_phase|kube_node.*|kube_persistentvolume_status_phase|kube_persistentvolumeclaim_access_mode|kube_persistentvolumeclaim_info|kube_persistentvolumeclaim_labels|kube_persistentvolumeclaim_resource_requests_storage_bytes|kube_persistentvolumeclaim_status_phase|kube_pod_container_info|kube_pod_container_resource_limits|kube_pod_container_resource_requests|kube_pod_container_status_last_terminated_reason|kube_pod_container_status_restarts_total|kube_pod_container_status_waiting_reason|kube_pod_info|kube_pod_owner|kube_pod_spec_volumes_persistentvolumeclaims_info|kube_pod_start_time|kube_pod_status_phase|kube_pod_status_reason|kube_replicaset.*|kube_resourcequota|kube_secret_metadata_resource_version|kube_statefulset.*"
+    keep_metrics = "up|scrape_samples_scraped|(.+)"
     scheme = "http"
     scrape_interval = "60s"
     max_cache_size = 100000
@@ -204,7 +204,45 @@ declare "cluster_metrics" {
       regex = "logs|o11y"
     }
     forward_to = argument.metrics_destinations.value
-  }        
+  }  
+  
+  remote.kubernetes.configmap "node_exporter" {
+    name = "k8smon-alloy-module-system"
+    namespace = "default"
+  }
+  
+  import.string "node_exporter" {
+    content = remote.kubernetes.configmap.node_exporter.data["node-exporter_metrics.alloy"]
+  }
+  
+  node_exporter.kubernetes "targets" {
+    namespaces = ["default"]
+    port_name = "metrics"
+    label_selectors = [
+      "app.kubernetes.io/name=node-exporter",
+      "release=k8smon",
+    ]
+  }
+  
+  discovery.relabel "node_exporter" {
+    targets = node_exporter.kubernetes.targets.output
+    rule {
+      source_labels = ["__meta_kubernetes_pod_node_name"]
+      action = "replace"
+      target_label = "instance"
+    }
+  }
+  
+  node_exporter.scrape "metrics" {
+    targets = discovery.relabel.node_exporter.output
+    job_label = "integrations/node_exporter"
+    clustering = true
+    keep_metrics = "up|scrape_samples_scraped|node_cpu.*|node_exporter_build_info|node_filesystem.*|node_memory.*|node_network_receive_bytes_total|node_network_receive_drop_total|node_network_transmit_bytes_total|node_network_transmit_drop_total|process_cpu_seconds_total|process_resident_memory_bytes"
+    scheme = "http"
+    scrape_interval = "60s"
+    max_cache_size = 100000
+    forward_to = argument.metrics_destinations.value
+  }      
 }
 cluster_metrics "feature" {
   metrics_destinations = [
@@ -352,34 +390,43 @@ declare "pod_logs" {
       regex = "__meta_kubernetes_pod_annotation_(.+)"
     }
     rule {
-      source_labels = ["__meta_kubernetes_namespace"]
+      source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
       separator = ";"
-      regex = "(o11y)"
+      regex = "(?:o11y);(?:grafana)"
       target_label = "job"
       replacement = "integrations/grafana"
     }
     rule {
-      source_labels = ["__meta_kubernetes_namespace"]
+      source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
       separator = ";"
-      regex = "(o11y)"
+      regex = "(?:o11y);(?:grafana)"
       target_label = "instance"
       replacement = "grafana"
     }
     
+    // add static label of integration="loki" and instance="name" to pods that match the selector so they can be identified in the loki.process stages
     rule {
-      source_labels = ["__meta_kubernetes_namespace"]
+      source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
       separator = ";"
-      regex = "(logs)"
-      target_label = "job"
-      replacement = "integrations/loki"
+      regex = "(?:logs);(?:loki)"
+      target_label = "integration"
+      replacement = "loki"
     }
     rule {
-      source_labels = ["__meta_kubernetes_namespace"]
+      source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
       separator = ";"
-      regex = "(logs)"
+      regex = "(?:logs);(?:loki)"
       target_label = "instance"
       replacement = "loki"
     }
+    // override the job label to be namespace/component so it aligns to the loki-mixin
+    rule {
+      source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name","__meta_kubernetes_namespace","__meta_kubernetes_pod_label_component"]
+      separator = ";"
+      regex = "(?:logs);(?:loki);([^;]+);([^;]+)"
+      target_label = "job"
+      replacement = "$1/$2"
+    }
   }
   
   discovery.kubernetes "pods" {
@@ -447,6 +494,10 @@ declare "pod_logs" {
           "level" = "",
           "logger" = "",
           "type" = "",
+          "caller" = "caller",
+          "org_id" = "org_id",
+          "tenant" = "tenant",
+          "user" = "user",
         }
       }
     
@@ -466,17 +517,30 @@ declare "pod_logs" {
         expression = "( t=[^ ]+\\s+)"
         replace = ""
       }
+      // set the structured metadata values
+      stage.structured_metadata {
+        values = {
+          "caller" = "caller",
+          "org_id" = "org_id",
+          "tenant" = "tenant",
+          "user" = "user",
+        }
+      }
     } 
      
     // Integration: Loki
     stage.match {
-      selector = "{job=\"integrations/loki\",instance=\"loki\",namespace=~\"logs\"}"
+      selector = "{integration=\"loki\",instance=\"loki\",namespace=~\"logs\"}"
     
       // extract some of the fields from the log line
       stage.logfmt {
         mapping = {
           "ts" = "",
           "level" = "",
+          "caller" = "caller",
+          "org_id" = "org_id",
+          "tenant" = "tenant",
+          "user" = "user",
         }
       }
     
@@ -496,6 +560,21 @@ declare "pod_logs" {
         expression = "(ts=[^ ]+\\s+)"
         replace = ""
       }
+      // clean up the caller to remove the line
+      stage.replace {
+        source = "caller"
+        expression = "(:[0-9]+$)"
+        replace = ""
+      }
+      // set the structured metadata values
+      stage.structured_metadata {
+        values = {
+          "caller" = "caller",
+          "org_id" = "org_id",
+          "tenant" = "tenant",
+          "user" = "user",
+        }
+      }
     
     }
   
@@ -1023,7 +1102,7 @@ declare "grafana_integration" {
   
   grafana_integration_discovery "grafana" {
     namespaces = ["o11y"]
-    label_selectors = []
+    label_selectors = ["app.kubernetes.io/name in (grafana)"]
     port_name = "grafana"
   }
   
@@ -1099,6 +1178,13 @@ declare "loki_integration" {
         action = "keep"
       }
 
+      // the loki-mixin expects the job label to be namespace/component
+      rule {
+        source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_component"]
+        separator = "/"
+        target_label = "job"
+      }
+
       
     
     rule {
@@ -1237,15 +1323,42 @@ declare "loki_integration" {
       // drop metrics that match the drop_metrics regex
       rule {
         source_labels = ["__name__"]
-        regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)")
+        regex = coalesce(argument.drop_metrics.value, "")
         action = "drop"
       }
+
+      // keep only metrics that match the keep_metrics regex
+      rule {
+        source_labels = ["__name__"]
+        regex = coalesce(argument.keep_metrics.value, "(.+)")
+        action = "keep"
+      }
+
+      // the loki-mixin expects the instance label to be the node name
+      rule {
+        source_labels = ["node"]
+        target_label = "instance"
+        replacement = "$1"
+      }
+      rule {
+        action = "labeldrop"
+        regex = "node"
+      }
+
+      // set the memcached exporter container name from container="exporter" to container="memcached"
+      rule {
+        source_labels = ["component", "container"]
+        separator = ";"
+        regex = "memcached-[^;]+;exporter"
+        target_label = "container"
+        replacement = "memcached"
+      }
     }
   }
   
   loki_integration_discovery "loki" {
     namespaces = ["logs"]
-    label_selectors = []
+    label_selectors = ["app.kubernetes.io/name in (loki)"]
     port_name = "http-metrics"
   }
   
diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml b/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml
index 22e3d0d11..7e3b6a3e8 100644
--- a/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml
+++ b/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml
@@ -32,6 +32,23 @@ metadata:
   name: k8smon-kube-state-metrics
   namespace: default
 ---
+# Source: k8s-monitoring/charts/clusterMetrics/charts/node-exporter/templates/serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: k8smon-node-exporter
+  namespace: default
+  labels:
+    helm.sh/chart: node-exporter-4.43.1
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: metrics
+    app.kubernetes.io/part-of: node-exporter
+    app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/instance: k8smon
+    app.kubernetes.io/version: "1.8.2"
+    release: k8smon
+automountServiceAccountToken: false
+---
 # Source: k8s-monitoring/templates/alloy-config.yaml
 apiVersion: v1
 kind: ConfigMap
@@ -230,7 +247,7 @@ data:
         targets = kube_state_metrics.kubernetes.targets.output
         clustering = true
         job_label = "integrations/kubernetes/kube-state-metrics"
-        keep_metrics = "up|scrape_samples_scraped|kube_configmap_info|kube_configmap_metadata_resource_version|kube_daemonset.*|kube_deployment_metadata_generation|kube_deployment_spec_replicas|kube_deployment_status_condition|kube_deployment_status_observed_generation|kube_deployment_status_replicas_available|kube_deployment_status_replicas_updated|kube_horizontalpodautoscaler_spec_max_replicas|kube_horizontalpodautoscaler_spec_min_replicas|kube_horizontalpodautoscaler_status_current_replicas|kube_horizontalpodautoscaler_status_desired_replicas|kube_job.*|kube_namespace_status_phase|kube_node.*|kube_persistentvolume_status_phase|kube_persistentvolumeclaim_access_mode|kube_persistentvolumeclaim_info|kube_persistentvolumeclaim_labels|kube_persistentvolumeclaim_resource_requests_storage_bytes|kube_persistentvolumeclaim_status_phase|kube_pod_container_info|kube_pod_container_resource_limits|kube_pod_container_resource_requests|kube_pod_container_status_last_terminated_reason|kube_pod_container_status_restarts_total|kube_pod_container_status_waiting_reason|kube_pod_info|kube_pod_owner|kube_pod_spec_volumes_persistentvolumeclaims_info|kube_pod_start_time|kube_pod_status_phase|kube_pod_status_reason|kube_replicaset.*|kube_resourcequota|kube_secret_metadata_resource_version|kube_statefulset.*"
+        keep_metrics = "up|scrape_samples_scraped|(.+)"
         scheme = "http"
         scrape_interval = "60s"
         max_cache_size = 100000
@@ -246,7 +263,45 @@ data:
           regex = "logs|o11y"
         }
         forward_to = argument.metrics_destinations.value
-      }        
+      }  
+      
+      remote.kubernetes.configmap "node_exporter" {
+        name = "k8smon-alloy-module-system"
+        namespace = "default"
+      }
+      
+      import.string "node_exporter" {
+        content = remote.kubernetes.configmap.node_exporter.data["node-exporter_metrics.alloy"]
+      }
+      
+      node_exporter.kubernetes "targets" {
+        namespaces = ["default"]
+        port_name = "metrics"
+        label_selectors = [
+          "app.kubernetes.io/name=node-exporter",
+          "release=k8smon",
+        ]
+      }
+      
+      discovery.relabel "node_exporter" {
+        targets = node_exporter.kubernetes.targets.output
+        rule {
+          source_labels = ["__meta_kubernetes_pod_node_name"]
+          action = "replace"
+          target_label = "instance"
+        }
+      }
+      
+      node_exporter.scrape "metrics" {
+        targets = discovery.relabel.node_exporter.output
+        job_label = "integrations/node_exporter"
+        clustering = true
+        keep_metrics = "up|scrape_samples_scraped|node_cpu.*|node_exporter_build_info|node_filesystem.*|node_memory.*|node_network_receive_bytes_total|node_network_receive_drop_total|node_network_transmit_bytes_total|node_network_transmit_drop_total|process_cpu_seconds_total|process_resident_memory_bytes"
+        scheme = "http"
+        scrape_interval = "60s"
+        max_cache_size = 100000
+        forward_to = argument.metrics_destinations.value
+      }      
     }
     cluster_metrics "feature" {
       metrics_destinations = [
@@ -394,34 +449,43 @@ data:
           regex = "__meta_kubernetes_pod_annotation_(.+)"
         }
         rule {
-          source_labels = ["__meta_kubernetes_namespace"]
+          source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "(o11y)"
+          regex = "(?:o11y);(?:grafana)"
           target_label = "job"
           replacement = "integrations/grafana"
         }
         rule {
-          source_labels = ["__meta_kubernetes_namespace"]
+          source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "(o11y)"
+          regex = "(?:o11y);(?:grafana)"
           target_label = "instance"
           replacement = "grafana"
         }
         
+        // add static label of integration="loki" and instance="name" to pods that match the selector so they can be identified in the loki.process stages
         rule {
-          source_labels = ["__meta_kubernetes_namespace"]
+          source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "(logs)"
-          target_label = "job"
-          replacement = "integrations/loki"
+          regex = "(?:logs);(?:loki)"
+          target_label = "integration"
+          replacement = "loki"
         }
         rule {
-          source_labels = ["__meta_kubernetes_namespace"]
+          source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "(logs)"
+          regex = "(?:logs);(?:loki)"
           target_label = "instance"
           replacement = "loki"
         }
+        // override the job label to be namespace/component so it aligns to the loki-mixin
+        rule {
+          source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_name","__meta_kubernetes_namespace","__meta_kubernetes_pod_label_component"]
+          separator = ";"
+          regex = "(?:logs);(?:loki);([^;]+);([^;]+)"
+          target_label = "job"
+          replacement = "$1/$2"
+        }
       }
       
       discovery.kubernetes "pods" {
@@ -489,6 +553,10 @@ data:
               "level" = "",
               "logger" = "",
               "type" = "",
+              "caller" = "caller",
+              "org_id" = "org_id",
+              "tenant" = "tenant",
+              "user" = "user",
             }
           }
         
@@ -508,17 +576,30 @@ data:
             expression = "( t=[^ ]+\\s+)"
             replace = ""
           }
+          // set the structured metadata values
+          stage.structured_metadata {
+            values = {
+              "caller" = "caller",
+              "org_id" = "org_id",
+              "tenant" = "tenant",
+              "user" = "user",
+            }
+          }
         } 
          
         // Integration: Loki
         stage.match {
-          selector = "{job=\"integrations/loki\",instance=\"loki\",namespace=~\"logs\"}"
+          selector = "{integration=\"loki\",instance=\"loki\",namespace=~\"logs\"}"
         
           // extract some of the fields from the log line
           stage.logfmt {
             mapping = {
               "ts" = "",
               "level" = "",
+              "caller" = "caller",
+              "org_id" = "org_id",
+              "tenant" = "tenant",
+              "user" = "user",
             }
           }
         
@@ -538,6 +619,21 @@ data:
             expression = "(ts=[^ ]+\\s+)"
             replace = ""
           }
+          // clean up the caller to remove the line
+          stage.replace {
+            source = "caller"
+            expression = "(:[0-9]+$)"
+            replace = ""
+          }
+          // set the structured metadata values
+          stage.structured_metadata {
+            values = {
+              "caller" = "caller",
+              "org_id" = "org_id",
+              "tenant" = "tenant",
+              "user" = "user",
+            }
+          }
         
         }
       
@@ -1065,7 +1161,7 @@ data:
       
       grafana_integration_discovery "grafana" {
         namespaces = ["o11y"]
-        label_selectors = []
+        label_selectors = ["app.kubernetes.io/name in (grafana)"]
         port_name = "grafana"
       }
       
@@ -1141,6 +1237,13 @@ data:
             action = "keep"
           }
     
+          // the loki-mixin expects the job label to be namespace/component
+          rule {
+            source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_component"]
+            separator = "/"
+            target_label = "job"
+          }
+    
           
         
         rule {
@@ -1279,15 +1382,42 @@ data:
           // drop metrics that match the drop_metrics regex
           rule {
             source_labels = ["__name__"]
-            regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)")
+            regex = coalesce(argument.drop_metrics.value, "")
             action = "drop"
           }
+    
+          // keep only metrics that match the keep_metrics regex
+          rule {
+            source_labels = ["__name__"]
+            regex = coalesce(argument.keep_metrics.value, "(.+)")
+            action = "keep"
+          }
+    
+          // the loki-mixin expects the instance label to be the node name
+          rule {
+            source_labels = ["node"]
+            target_label = "instance"
+            replacement = "$1"
+          }
+          rule {
+            action = "labeldrop"
+            regex = "node"
+          }
+    
+          // set the memcached exporter container name from container="exporter" to container="memcached"
+          rule {
+            source_labels = ["component", "container"]
+            separator = ";"
+            regex = "memcached-[^;]+;exporter"
+            target_label = "container"
+            replacement = "memcached"
+          }
         }
       }
       
       loki_integration_discovery "loki" {
         namespaces = ["logs"]
-        label_selectors = []
+        label_selectors = ["app.kubernetes.io/name in (loki)"]
         port_name = "http-metrics"
       }
       
@@ -1359,7 +1489,7 @@ data:
     grafana_kubernetes_monitoring_build_info{version="2.0.3", namespace="default"} 1
     # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
     # TYPE grafana_kubernetes_monitoring_feature_info gauge
-    grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics", feature="clusterMetrics", sources="cadvisor,kube-state-metrics", version="1.0.0"} 1
+    grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter", feature="clusterMetrics", sources="cadvisor,kube-state-metrics,node-exporter", version="1.0.0"} 1
     grafana_kubernetes_monitoring_feature_info{feature="clusterEvents", version="1.0.0"} 1
     grafana_kubernetes_monitoring_feature_info{feature="podLogs", method="kubernetesApi", version="1.0.0"} 1
     grafana_kubernetes_monitoring_feature_info{feature="integrations", sources="alloy,loki", version="1.0.0"} 1
@@ -2577,6 +2707,282 @@ data:
       }
     }
 ---
+# Source: k8s-monitoring/templates/alloy-modules-configmaps.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: k8smon-alloy-module-system
+data:
+  node-exporter_metrics.alloy: |
+    /*
+    Module: job-node_exporter
+    Description: Scrapes node_exporter
+    
+    Note: Every argument except for "forward_to" is optional, and does have a defined default value.  However, the values for these
+          arguments are not defined using the default = " ... " argument syntax, but rather using the coalesce(argument.value, " ... ").
+          This is because if the argument passed in from another consuming module is set to null, the default = " ... " syntax will
+          does not override the value passed in, where coalesce() will return the first non-null value.
+    */
+    declare "kubernetes" {
+      // arguments for kubernetes discovery
+      argument "namespaces" {
+        comment = "The namespaces to look for targets in (default: [] is all namespaces)"
+        optional = true
+      }
+    
+      argument "field_selectors" {
+        // Docs: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+        comment = "The label selectors to use to find matching targets (default: [])"
+        optional = true
+      }
+    
+      argument "label_selectors" {
+        // Docs: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+        comment = "The label selectors to use to find matching targets (default: [\"app.kubernetes.io/name=prometheus-node-exporter\"])"
+        optional = true
+      }
+    
+      argument "port_name" {
+        comment = "The of the port to scrape metrics from (default: metrics)"
+        optional = true
+      }
+    
+      // node_exporter service discovery for all of the pods
+      discovery.kubernetes "node_exporter" {
+        role = "pod"
+    
+        selectors {
+          role = "pod"
+          field = string.join(coalesce(argument.field_selectors.value, []), ",")
+          label = string.join(coalesce(argument.label_selectors.value, ["app.kubernetes.io/name=prometheus-node-exporter"]), ",")
+        }
+    
+        namespaces {
+          names = coalesce(argument.namespaces.value, [])
+        }
+      }
+    
+      // node_exporter relabelings (pre-scrape)
+      discovery.relabel "kubernetes" {
+        targets = discovery.kubernetes.node_exporter.targets
+    
+        // keep only the specified metrics port name, and pods that are Running and ready
+        rule {
+          source_labels = [
+            "__meta_kubernetes_pod_container_port_name",
+            "__meta_kubernetes_pod_phase",
+            "__meta_kubernetes_pod_ready",
+          ]
+          separator = "@"
+          regex = coalesce(argument.port_name.value, "metrics") + "@Running@true"
+          action = "keep"
+        }
+    
+        // drop any init containers
+        rule {
+          source_labels = ["__meta_kubernetes_pod_container_init"]
+          regex = "true"
+          action = "drop"
+        }
+    
+        // set the namespace label
+        rule {
+          source_labels = ["__meta_kubernetes_namespace"]
+          target_label  = "namespace"
+        }
+    
+        // set the pod label
+        rule {
+          source_labels = ["__meta_kubernetes_pod_name"]
+          target_label  = "pod"
+        }
+    
+        // set the container label
+        rule {
+          source_labels = ["__meta_kubernetes_pod_container_name"]
+          target_label  = "container"
+        }
+    
+        // set a workload label
+        rule {
+          source_labels = [
+            "__meta_kubernetes_pod_controller_kind",
+            "__meta_kubernetes_pod_controller_name",
+          ]
+          separator = "/"
+          target_label  = "workload"
+        }
+        // remove the hash from the ReplicaSet
+        rule {
+          source_labels = ["workload"]
+          regex = "(ReplicaSet/.+)-.+"
+          target_label  = "workload"
+        }
+    
+        // set the app name if specified as metadata labels "app:" or "app.kubernetes.io/name:" or "k8s-app:"
+        rule {
+          action = "replace"
+          source_labels = [
+            "__meta_kubernetes_pod_label_app_kubernetes_io_name",
+            "__meta_kubernetes_pod_label_k8s_app",
+            "__meta_kubernetes_pod_label_app",
+          ]
+          separator = ";"
+          regex = "^(?:;*)?([^;]+).*$"
+          replacement = "$1"
+          target_label = "app"
+        }
+    
+        // set the component if specified as metadata labels "component:" or "app.kubernetes.io/component:" or "k8s-component:"
+        rule {
+          action = "replace"
+          source_labels = [
+            "__meta_kubernetes_pod_label_app_kubernetes_io_component",
+            "__meta_kubernetes_pod_label_k8s_component",
+            "__meta_kubernetes_pod_label_component",
+          ]
+          regex = "^(?:;*)?([^;]+).*$"
+          replacement = "$1"
+          target_label = "component"
+        }
+    
+        // set a source label
+        rule {
+          action = "replace"
+          replacement = "kubernetes"
+          target_label = "source"
+        }
+      }
+    
+      export "output" {
+        value = discovery.relabel.kubernetes.output
+      }
+    }
+    
+    declare "local" {
+      argument "port" {
+        comment = "The port to use (default: 9100)"
+        optional = true
+      }
+    
+      // arguments for local (static)
+      discovery.relabel "local" {
+        targets = [
+          {
+            "__address__" = "localhost" + string.format("%s", coalesce(argument.port.value, "9100")),
+            "source" = "local",
+          },
+        ]
+      }
+    
+      export "output" {
+        value = discovery.relabel.local.output
+      }
+    }
+    
+    declare "scrape" {
+      argument "targets" {
+        comment = "Must be a list() of targets"
+      }
+    
+      argument "forward_to" {
+        comment = "Must be a list(MetricsReceiver) where collected metrics should be forwarded to"
+      }
+    
+      argument "job_label" {
+        comment = "The job label to add for all node_exporter metric (default: integrations/node_exporter)"
+        optional = true
+      }
+    
+      argument "keep_metrics" {
+        comment = "A regular expression of metrics to keep (default: see below)"
+        optional = true
+      }
+    
+      argument "drop_metrics" {
+        comment = "A regular expression of metrics to drop (default: see below)"
+        optional = true
+      }
+    
+      argument "scheme" {
+        comment = "The scheme to use when scraping metrics (default: http)"
+        optional = true
+      }
+    
+      argument "bearer_token_file" {
+        comment = "The bearer token file (default: none)"
+        optional = true
+      }
+    
+      argument "scrape_interval" {
+        comment = "How often to scrape metrics from the targets (default: 60s)"
+        optional = true
+      }
+    
+      argument "scrape_timeout" {
+        comment = "How long before a scrape times out (default: 10s)"
+        optional = true
+      }
+    
+      argument "max_cache_size" {
+        comment = "The maximum number of elements to hold in the relabeling cache (default: 100000).  This should be at least 2x-5x your largest scrape target or samples appended rate."
+        optional = true
+      }
+    
+      argument "clustering" {
+        // Docs: https://node_exporter.com/docs/agent/latest/flow/concepts/clustering/
+        comment = "Whether or not clustering should be enabled (default: false)"
+        optional = true
+      }
+    
+      // node_exporter scrape job
+      prometheus.scrape "node_exporter" {
+        job_name = coalesce(argument.job_label.value, "integrations/node_exporter")
+        forward_to = [prometheus.relabel.node_exporter.receiver]
+        targets = argument.targets.value
+        scrape_interval = coalesce(argument.scrape_interval.value, "60s")
+        scrape_timeout = coalesce(argument.scrape_timeout.value, "10s")
+    
+        scheme = coalesce(argument.scheme.value, "http")
+        bearer_token_file = coalesce(argument.bearer_token_file.value, "")
+        tls_config {
+          insecure_skip_verify = true
+        }
+    
+        clustering {
+          enabled = coalesce(argument.clustering.value, false)
+        }
+      }
+    
+      // node_exporter metric relabelings (post-scrape)
+      prometheus.relabel "node_exporter" {
+        forward_to = argument.forward_to.value
+        max_cache_size = coalesce(argument.max_cache_size.value, 100000)
+    
+        // drop metrics that match the drop_metrics regex
+        rule {
+          source_labels = ["__name__"]
+          regex = coalesce(argument.drop_metrics.value, "(^(go)_.+$)")
+          action = "drop"
+        }
+    
+        // keep only metrics that match the keep_metrics regex
+        rule {
+          source_labels = ["__name__"]
+          regex = coalesce(argument.keep_metrics.value, "(up|scrape_(duration_seconds|series_added|samples_(post_metric_relabeling|scraped))|node_(arp_entries|boot_time_seconds|context_switches_total|cpu_seconds_total|disk_(io_time_seconds_total|io_time_weighted_seconds_total|read_(bytes_total|time_seconds_total)|reads_completed_total|write_time_seconds_total|writes_completed_total|written_bytes_total)|file(fd_(allocated|maximum)|system_(avail_bytes|device_error|files(_free)?|readonly|size_bytes))|intr_total|load(1|15|5)|md_disks(_required)?|memory_(Active_(anon_bytes|bytes|file_bytes)|Anon(HugePages_bytes|Pages_bytes)|Bounce_bytes|Buffers_bytes|Cached_bytes|CommitLimit_bytes|Committed_AS_bytes|DirectMap(1G|2M|4k)_bytes|Dirty_bytes|HugePages_(Free|Rsvd|Surp|Total)|Hugepagesize_bytes|Inactive_(anon_bytes|bytes|file_bytes)|Mapped_bytes|Mem(Available|Free|Total)_bytes|S(Reclaimable|Unreclaim)_bytes|Shmem(HugePages_bytes|PmdMapped_bytes|_bytes)|Slab_bytes|SwapTotal_bytes|Vmalloc(Chunk|Total|Used)_bytes|Writeback(Tmp|)_bytes)|netstat_(Icmp6_(InErrors|InMsgs|OutMsgs)|Icmp_(InErrors|InMsgs|OutMsgs)|IpExt_(InOctets|OutOctets)|TcpExt_(Listen(Drops|Overflows)|TCPSynRetrans)|Tcp_(InErrs|InSegs|OutRsts|OutSegs|RetransSegs)|Udp6_(InDatagrams|InErrors|NoPorts|OutDatagrams|RcvbufErrors|SndbufErrors)|Udp(Lite|)_(InDatagrams|InErrors|NoPorts|OutDatagrams|RcvbufErrors|SndbufErrors))|network_(carrier|info|mtu_bytes|receive_(bytes_total|compressed_total|drop_total|errs_total|fifo_total|multicast_total|packets_total)|speed_bytes|transmit_(bytes_total|compressed_total|drop_total|errs_total|fifo_total|multicast_total|packets_total|queue_length)|up)|nf_conntrack_(entries(_limit)?|limit)|os_info|sockstat_(FRAG6|FRAG|RAW6|RAW|TCP6|TCP_(alloc|inuse|mem(_bytes)?|orphan|tw)|UDP6|UDPLITE6|UDPLITE|UDP_(inuse|mem(_bytes)?)|sockets_used)|softnet_(dropped_total|processed_total|times_squeezed_total)|systemd_unit_state|textfile_scrape_error|time_zone_offset_seconds|timex_(estimated_error_seconds|maxerror_seconds|offset_seconds|sync_status)|uname_info|vmstat_(oom_kill|pgfault|pgmajfault|pgpgin|pgpgout|pswpin|pswpout)|process_(max_fds|open_fds)))")
+          action = "keep"
+        }
+    
+        // Drop metrics for certain file systems
+        rule {
+          source_labels = ["__name__", "fstype"]
+          separator = "@"
+          regex = "node_filesystem.*@(tempfs)"
+          action = "drop"
+        }
+      }
+    }
+---
 # Source: k8s-monitoring/charts/alloy-singleton/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -2933,6 +3339,161 @@ spec:
     app.kubernetes.io/name: kube-state-metrics
     app.kubernetes.io/instance: k8smon
 ---
+# Source: k8s-monitoring/charts/clusterMetrics/charts/node-exporter/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: k8smon-node-exporter
+  namespace: default
+  labels:
+    helm.sh/chart: node-exporter-4.43.1
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: metrics
+    app.kubernetes.io/part-of: node-exporter
+    app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/instance: k8smon
+    app.kubernetes.io/version: "1.8.2"
+    release: k8smon
+  annotations:
+    prometheus.io/scrape: "false"
+spec:
+  type: ClusterIP
+  ports:
+    - port: 9100
+      targetPort: 9100
+      protocol: TCP
+      name: metrics
+  selector:
+    app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/instance: k8smon
+---
+# Source: k8s-monitoring/charts/clusterMetrics/charts/node-exporter/templates/daemonset.yaml
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: k8smon-node-exporter
+  namespace: default
+  labels:
+    helm.sh/chart: node-exporter-4.43.1
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: metrics
+    app.kubernetes.io/part-of: node-exporter
+    app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/instance: k8smon
+    app.kubernetes.io/version: "1.8.2"
+    release: k8smon
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: node-exporter
+      app.kubernetes.io/instance: k8smon
+  revisionHistoryLimit: 10
+  updateStrategy:
+    rollingUpdate:
+      maxUnavailable: 1
+    type: RollingUpdate
+  template:
+    metadata:
+      annotations:
+        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
+        k8s.grafana.com/logs.job: integrations/node_exporter
+      labels:
+        helm.sh/chart: node-exporter-4.43.1
+        app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/component: metrics
+        app.kubernetes.io/part-of: node-exporter
+        app.kubernetes.io/name: node-exporter
+        app.kubernetes.io/instance: k8smon
+        app.kubernetes.io/version: "1.8.2"
+        release: k8smon
+    spec:
+      automountServiceAccountToken: false
+      securityContext:
+        fsGroup: 65534
+        runAsGroup: 65534
+        runAsNonRoot: true
+        runAsUser: 65534
+      serviceAccountName: k8smon-node-exporter
+      containers:
+        - name: node-exporter
+          image: quay.io/prometheus/node-exporter:v1.8.2
+          imagePullPolicy: IfNotPresent
+          args:
+            - --path.procfs=/host/proc
+            - --path.sysfs=/host/sys
+            - --path.rootfs=/host/root
+            - --path.udev.data=/host/root/run/udev/data
+            - --web.listen-address=[$(HOST_IP)]:9100
+          securityContext:
+            readOnlyRootFilesystem: true
+          env:
+            - name: HOST_IP
+              value: 0.0.0.0
+          ports:
+            - name: metrics
+              containerPort: 9100
+              protocol: TCP
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              httpHeaders:
+              path: /
+              port: 9100
+              scheme: HTTP
+            initialDelaySeconds: 0
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              httpHeaders:
+              path: /
+              port: 9100
+              scheme: HTTP
+            initialDelaySeconds: 0
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+          volumeMounts:
+            - name: proc
+              mountPath: /host/proc
+              readOnly:  true
+            - name: sys
+              mountPath: /host/sys
+              readOnly: true
+            - name: root
+              mountPath: /host/root
+              mountPropagation: HostToContainer
+              readOnly: true
+      hostNetwork: true
+      hostPID: true
+      hostIPC: false
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: eks.amazonaws.com/compute-type
+                operator: NotIn
+                values:
+                - fargate
+      nodeSelector:
+        kubernetes.io/os: linux
+      tolerations:
+        - effect: NoSchedule
+          operator: Exists
+      volumes:
+        - name: proc
+          hostPath:
+            path: /proc
+        - name: sys
+          hostPath:
+            path: /sys
+        - name: root
+          hostPath:
+            path: /
+---
 # Source: k8s-monitoring/charts/alloy-singleton/templates/controllers/deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
@@ -3091,7 +3652,7 @@ spec:
         - --port=8080
         - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments
         - --metric-labels-allowlist=nodes=[agentpool,alpha.eksctl.io/cluster-name,alpha.eksctl.io/nodegroup-name,beta.kubernetes.io/instance-type,cloud.google.com/gke-nodepool,cluster_name,ec2_amazonaws_com_Name,ec2_amazonaws_com_aws_autoscaling_groupName,ec2_amazonaws_com_aws_autoscaling_group_name,ec2_amazonaws_com_name,eks_amazonaws_com_nodegroup,k8s_io_cloud_provider_aws,karpenter.sh/nodepool,kubernetes.azure.com/cluster,kubernetes.io/arch,kubernetes.io/hostname,kubernetes.io/os,node.kubernetes.io/instance-type,topology.kubernetes.io/region,topology.kubernetes.io/zone]
-        - --namespaces=logs
+        - --namespaces=logs,o11y
         imagePullPolicy: IfNotPresent
         image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.14.0
         ports:
diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/values.yaml b/charts/k8s-monitoring/docs/examples/meta-monitoring/values.yaml
index 3ab1cf2bb..c1e925109 100644
--- a/charts/k8s-monitoring/docs/examples/meta-monitoring/values.yaml
+++ b/charts/k8s-monitoring/docs/examples/meta-monitoring/values.yaml
@@ -32,11 +32,24 @@ integrations:
       - name: loki
         namespaces:
           - logs
+        labelSelectors:
+          app.kubernetes.io/name: [loki]
+        logs:
+          tuning:
+            # extract logfmt fields and set them as structured metadata
+            structuredMetadata:
+              caller:
+              tenant:
+              org_id:
+              user:
+
   grafana:
     instances:
       - name: grafana
         namespaces:
           - o11y
+        labelSelectors:
+          app.kubernetes.io/name: [grafana]
 
 clusterEvents:
   enabled: true
@@ -74,15 +87,20 @@ clusterMetrics:
     enabled: true
     namespaces:
       - logs
+      - o11y
     extraMetricProcessingRules: |-
       rule {
         action = "keep"
         source_labels = ["namespace"]
         regex = "logs|o11y"
       }
+    metricsTuning:
+      useDefaultAllowList: false
+      includeMetrics: [(.+)]
   node-exporter:
-    enabled: false
-    deploy: false
+    enabled: true
+    useIntegrationAllowList: true
+    deploy: true
   windows-exporter:
     enabled: false
     deploy: false
diff --git a/charts/k8s-monitoring/tests/integration/integration-grafana/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/integration-grafana/.rendered/output.yaml
index b1c0a3523..422ebac6a 100644
--- a/charts/k8s-monitoring/tests/integration/integration-grafana/.rendered/output.yaml
+++ b/charts/k8s-monitoring/tests/integration/integration-grafana/.rendered/output.yaml
@@ -988,14 +988,14 @@ data:
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "grafana"
+          regex = "(?:grafana)"
           target_label = "job"
           replacement = "integrations/grafana"
         }
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "grafana"
+          regex = "(?:grafana)"
           target_label = "instance"
           replacement = "grafana"
         }
diff --git a/charts/k8s-monitoring/tests/integration/integration-loki/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/integration-loki/.rendered/output.yaml
index 09fa9ae78..fea47a712 100644
--- a/charts/k8s-monitoring/tests/integration/integration-loki/.rendered/output.yaml
+++ b/charts/k8s-monitoring/tests/integration/integration-loki/.rendered/output.yaml
@@ -495,6 +495,13 @@ data:
             action = "keep"
           }
     
+          // the loki-mixin expects the job label to be namespace/component
+          rule {
+            source_labels = ["__meta_kubernetes_namespace","__meta_kubernetes_pod_label_app_kubernetes_io_component"]
+            separator = "/"
+            target_label = "job"
+          }
+    
           
         
         rule {
@@ -633,9 +640,36 @@ data:
           // drop metrics that match the drop_metrics regex
           rule {
             source_labels = ["__name__"]
-            regex = coalesce(argument.drop_metrics.value, "(^(go|process)_.+$)")
+            regex = coalesce(argument.drop_metrics.value, "")
             action = "drop"
           }
+    
+          // keep only metrics that match the keep_metrics regex
+          rule {
+            source_labels = ["__name__"]
+            regex = coalesce(argument.keep_metrics.value, "(.+)")
+            action = "keep"
+          }
+    
+          // the loki-mixin expects the instance label to be the node name
+          rule {
+            source_labels = ["node"]
+            target_label = "instance"
+            replacement = "$1"
+          }
+          rule {
+            action = "labeldrop"
+            regex = "node"
+          }
+    
+          // set the memcached exporter container name from container="exporter" to container="memcached"
+          rule {
+            source_labels = ["component", "container"]
+            separator = ";"
+            regex = "memcached-[^;]+;exporter"
+            target_label = "container"
+            replacement = "memcached"
+          }
         }
       }
       
@@ -986,20 +1020,29 @@ data:
           action = "labelmap"
           regex = "__meta_kubernetes_pod_annotation_(.+)"
         }
+        // add static label of integration="loki" and instance="name" to pods that match the selector so they can be identified in the loki.process stages
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "loki"
-          target_label = "job"
-          replacement = "integrations/loki"
+          regex = "(?:loki)"
+          target_label = "integration"
+          replacement = "loki"
         }
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
           separator = ";"
-          regex = "loki"
+          regex = "(?:loki)"
           target_label = "instance"
           replacement = "loki"
         }
+        // override the job label to be namespace/component so it aligns to the loki-mixin
+        rule {
+          source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name","__meta_kubernetes_namespace","__meta_kubernetes_pod_label_component"]
+          separator = ";"
+          regex = "(?:loki);([^;]+);([^;]+)"
+          target_label = "job"
+          replacement = "$1/$2"
+        }
       }
       
       discovery.kubernetes "pods" {
@@ -1075,7 +1118,7 @@ data:
         }
         // Integration: Loki
         stage.match {
-          selector = "{job=\"integrations/loki\",instance=\"loki\"}"
+          selector = "{integration=\"loki\",instance=\"loki\"}"
         
           // extract some of the fields from the log line
           stage.logfmt {
diff --git a/charts/k8s-monitoring/tests/integration/integration-loki/deployments/query-test.yaml b/charts/k8s-monitoring/tests/integration/integration-loki/deployments/query-test.yaml
index ee0c2ea4d..6470067a3 100644
--- a/charts/k8s-monitoring/tests/integration/integration-loki/deployments/query-test.yaml
+++ b/charts/k8s-monitoring/tests/integration/integration-loki/deployments/query-test.yaml
@@ -34,6 +34,7 @@ spec:
     tests:
       - env:
           CLUSTER: loki-integration-test
+          NAMESPACE: loki
           PROMETHEUS_URL: http://prometheus-server.prometheus.svc:9090/api/v1/query
           PROMETHEUS_USER: promuser
           PROMETHEUS_PASS: prometheuspassword
@@ -43,10 +44,10 @@ spec:
           LOKI_PASS: lokipassword
         queries:
           # Loki metrics
-          - query: loki_build_info{cluster="$CLUSTER", job="integrations/loki"}
+          - query: loki_build_info{cluster="$CLUSTER", namespace="$NAMESPACE"}
 
           # Loki Logs
-          - query: count_over_time({cluster="$CLUSTER", job="integrations/loki"}[1h])
+          - query: count_over_time({cluster="$CLUSTER", namespace="$NAMESPACE"}[1h])
             type: logql
 
           # DPM check
diff --git a/charts/k8s-monitoring/tests/integration/integration-mysql/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/integration-mysql/.rendered/output.yaml
index 5276f840c..0f063f53e 100644
--- a/charts/k8s-monitoring/tests/integration/integration-mysql/.rendered/output.yaml
+++ b/charts/k8s-monitoring/tests/integration/integration-mysql/.rendered/output.yaml
@@ -295,14 +295,14 @@ data:
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
           separator = ";"
-          regex = "test-database"
+          regex = "(?:test-database)"
           target_label = "integration"
           replacement = "mysql"
         }
         rule {
           source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"]
           separator = ";"
-          regex = "test-database"
+          regex = "(?:test-database)"
           target_label = "instance"
           replacement = "test-database"
         }