diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index 4929280..03c2389 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -9,6 +9,8 @@ on:
 jobs:
   publish:
     name: Publish
+    # Check if the PR is not from a fork
+    if: github.repository_owner == 'samber'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
diff --git a/.gitignore b/.gitignore
index 12ca387..66a746a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ _site/
 .jekyll-metadata
 _data/rules.json
 test/rules/
+/node_modules
\ No newline at end of file
diff --git a/FUNDING.json b/FUNDING.json
new file mode 100644
index 0000000..c4eccbf
--- /dev/null
+++ b/FUNDING.json
@@ -0,0 +1,7 @@
+{
+  "drips": {
+    "ethereum": {
+      "ownedBy": "0x1Baee8431ead537455399cC7099eBb219227C1f1"
+    }
+  }
+}
diff --git a/Gemfile.lock b/Gemfile.lock
index 1afa3ed..305a897 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -248,7 +248,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.3.7)
+    rexml (3.3.9)
     rouge (3.30.0)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
diff --git a/README.md b/README.md
index 9188322..fdb5643 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,7 @@ Collection available here: **[https://samber.github.io/awesome-prometheus-alerts
 - [Loki](https://samber.github.io/awesome-prometheus-alerts/rules#loki)
 - [Promtail](https://samber.github.io/awesome-prometheus-alerts/rules#promtail)
 - [Cortex](https://samber.github.io/awesome-prometheus-alerts/rules#cortex)
+- [Grafana Alloy](https://samber.github.io/awesome-prometheus-alerts/rules#grafana-alloy)
 - [Jenkins](https://samber.github.io/awesome-prometheus-alerts/rules#jenkins)
 - [Graph Node](https://samber.github.io/awesome-prometheus-alerts/rules#graph-node)
 
diff --git a/_data/rules.yml b/_data/rules.yml
index c155775..eab61c2 100644
--- a/_data/rules.yml
+++ b/_data/rules.yml
@@ -27,7 +27,7 @@ groups:
                 severity: critical
               - name: Prometheus target missing with warmup time
                 description: Allow a job time to start up (10 minutes) before alerting that it's down.
-                query: "sum by (instance, job) ((up == 0) * on (instance) group_left (__name__) (node_time_seconds - node_boot_time_seconds > 600))"
+                query: "sum by (instance, job) ((up == 0) * on (instance) group_right(job) (node_time_seconds - node_boot_time_seconds > 600))"
                 severity: critical
               - name: Prometheus configuration reload failure
                 description: Prometheus configuration reload error
@@ -126,8 +126,7 @@ groups:
                 severity: critical
               - name: Prometheus timeseries cardinality
                 description: 'The "{{ $labels.name }}" timeseries cardinality is getting very high: {{ $value }}'
-                # Node CPU and Node SystemD Unit State are always high cardinality due to systemd containing services and CPU containing cores
-                query: '(label_replace(count by (__name__) ({__name__=~".+"}), "name", "$1", "__name__", "(.+)") unless on (__name__) ({__name__=~"node_cpu.*|node_systemd_unit_state"})) > 10000'
+                query: 'label_replace(count by(__name__) ({__name__=~".+"}), "name", "$1", "__name__", "(.+)") > 10000'
                 severity: warning
 
       - name: Host and hardware
@@ -138,45 +137,53 @@ groups:
             rules:
               - name: Host out of memory
                 description: Node memory is filling up (< 10% left)
-                query: '(node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes < .10)'
+                query: '(node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes * 100 < 10) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 2m
               - name: Host memory under memory pressure
-                description: The node is under heavy memory pressure. High rate of loading memory pages from disk.
-                query: '(rate(node_vmstat_pgmajfault[5m]) > 1000)'
+                description: The node is under heavy memory pressure. High rate of major page faults
+                query: '(rate(node_vmstat_pgmajfault[1m]) > 1000) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
+                for: 2m
               - name: Host Memory is underutilized
-                description: "Node memory usage is < 20% for 1 week. Consider reducing memory space. (instance {{ $labels.instance }})"
-                # We use MemFree, many buffers (ZFS, databases etc) are declared as available memory, but would perform poorly if reduced
-                query: 'min_over_time(node_memory_MemFree_bytes[1w]) > node_memory_MemTotal_bytes * .8'
+                description: "Node memory is < 20% for 1 week. Consider reducing memory space. (instance {{ $labels.instance }})"
+                query: '(100 - (avg_over_time(node_memory_MemAvailable_bytes[30m]) / node_memory_MemTotal_bytes * 100) < 20) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: info
+                for: 1w
                 comments: |
                   You may want to increase the alert manager 'repeat_interval' for this type of alert to daily or weekly
               - name: Host unusual network throughput in
-                description: "Host receive bandwidth is high (>80%)"
-                query: '((rate(node_network_receive_bytes_total[5m]) / on(instance, device) node_network_speed_bytes) > .80)'
+                description: Host network interfaces are probably receiving too much data (> 100 MB/s)
+                query: '(sum by (instance) (rate(node_network_receive_bytes_total[2m])) / 1024 / 1024 > 100) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
+                for: 5m
               - name: Host unusual network throughput out
-                description: "Host transmit bandwidth is high (>80%)"
-                query: '((rate(node_network_transmit_bytes_total[5m]) / on(instance, device) node_network_speed_bytes) > .80)'
+                description: Host network interfaces are probably sending too much data (> 100 MB/s)
+                query: '(sum by (instance) (rate(node_network_transmit_bytes_total[2m])) / 1024 / 1024 > 100) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
+                for: 5m
               - name: Host unusual disk read rate
-                description: "Disk is too busy (IO wait > 80%)"
-                query: '(rate(node_disk_io_time_seconds_total[5m]) > .80)'
+                description: Disk is probably reading too much data (> 50 MB/s)
+                query: '(sum by (instance) (rate(node_disk_read_bytes_total[2m])) / 1024 / 1024 > 50) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
+                for: 5m
+              - name: Host unusual disk write rate
+                description: Disk is probably writing too much data (> 50 MB/s)
+                query: '(sum by (instance) (rate(node_disk_written_bytes_total[2m])) / 1024 / 1024 > 50) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
+                severity: warning
+                for: 2m
               - name: Host out of disk space
-                description: "Disk is almost full (< 10% left)"
-                # Network filesystems have quotas etc. and should not be included in this alert
-                query: '(node_filesystem_avail_bytes{fstype!~"^(fuse.*|tmpfs|cifs|nfs)"} / node_filesystem_size_bytes < .10 and on (instance, device, mountpoint) node_filesystem_readonly == 0)'
-                severity: critical
+                description: Disk is almost full (< 10% left)
+                query: '((node_filesystem_avail_bytes * 100) / node_filesystem_size_bytes < 10 and ON (instance, device, mountpoint) node_filesystem_readonly == 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
+                severity: warning
                 comments: |
                   Please add ignored mountpoints in node_exporter parameters like
                   "--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|run)($|/)".
                   Same rule using "node_filesystem_free_bytes" will fire when disk fills for non-root users.
                 for: 2m
-              - name: Host disk may fill in 24 hours
-                description: Filesystem will likely run out of space within the next 24 hours
-                query: 'predict_linear(node_filesystem_avail_bytes{fstype!~"^(fuse.*|tmpfs|cifs|nfs)"}[1h], 86400) <= 0 and node_filesystem_avail_bytes > 0'
+              - name: Host disk will fill in 24 hours
+                description: Filesystem is predicted to run out of space within the next 24 hours at current write rate
+                query: '((node_filesystem_avail_bytes * 100) / node_filesystem_size_bytes < 10 and ON (instance, device, mountpoint) predict_linear(node_filesystem_avail_bytes{fstype!~"tmpfs"}[1h], 24 * 3600) < 0 and ON (instance, device, mountpoint) node_filesystem_readonly == 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 comments: |
                   Please add ignored mountpoints in node_exporter parameters like
@@ -185,65 +192,57 @@ groups:
                 for: 2m
               - name: Host out of inodes
                 description: Disk is almost running out of available inodes (< 10% left)
-                query: '(node_filesystem_files_free{fstype!="msdosfs"} / node_filesystem_files{fstype!="msdosfs"} < .10 and ON (instance, device, mountpoint) node_filesystem_readonly == 0)'
-                severity: critical
+                query: '(node_filesystem_files_free{fstype!="msdosfs"} / node_filesystem_files{fstype!="msdosfs"} * 100 < 10 and ON (instance, device, mountpoint) node_filesystem_readonly == 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
+                severity: warning
                 for: 2m
               - name: Host filesystem device error
-                description: "Error stat-ing the {{ $labels.mountpoint }} filesystem"
-                query: 'node_filesystem_device_error{fstype!~"^(fuse.*|tmpfs|cifs|nfs)"} == 1'
+                description: "{{ $labels.instance }}: Device error with the {{ $labels.mountpoint }} filesystem"
+                query: "node_filesystem_device_error == 1"
                 severity: critical
-                comments: |
-                  This indicates there was a problem getting information for the filesystem via statfs. 
-                  This is usually due to permissions issues or virtual filesystems.
-                  Please add ignored mountpoints in node_exporter parameters like
-                  "--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|run)($|/)".
                 for: 2m
               - name: Host inodes will fill in 24 hours
                 description: Filesystem is predicted to run out of inodes within the next 24 hours at current write rate
-                query: 'predict_linear(node_filesystem_files_free{fstype!~"^(fuse.*|tmpfs|cifs|nfs)"}[1h], 86400) <= 0 and node_filesystem_files_free > 0'
+                query: '(node_filesystem_files_free{fstype!="msdosfs"} / node_filesystem_files{fstype!="msdosfs"} * 100 < 10 and predict_linear(node_filesystem_files_free{fstype!="msdosfs"}[1h], 24 * 3600) < 0 and ON (instance, device, mountpoint) node_filesystem_readonly{fstype!="msdosfs"} == 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 2m
               - name: Host unusual disk read latency
                 description: Disk latency is growing (read operations > 100ms)
-                query: '(rate(node_disk_read_time_seconds_total[1m]) / rate(node_disk_reads_completed_total[1m]) > 0.1 and rate(node_disk_reads_completed_total[1m]) > 0)'
+                query: '(rate(node_disk_read_time_seconds_total[1m]) / rate(node_disk_reads_completed_total[1m]) > 0.1 and rate(node_disk_reads_completed_total[1m]) > 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 2m
               - name: Host unusual disk write latency
                 description: Disk latency is growing (write operations > 100ms)
-                query: '(rate(node_disk_write_time_seconds_total[1m]) / rate(node_disk_writes_completed_total[1m]) > 0.1 and rate(node_disk_writes_completed_total[1m]) > 0)'
+                query: '(rate(node_disk_write_time_seconds_total[1m]) / rate(node_disk_writes_completed_total[1m]) > 0.1 and rate(node_disk_writes_completed_total[1m]) > 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 2m
               - name: Host high CPU load
                 description: CPU load is > 80%
-                query: '(avg by (instance) (rate(node_cpu_seconds_total{mode!="idle"}[2m]))) > .80'
+                query: '(sum by (instance) (avg by (mode, instance) (rate(node_cpu_seconds_total{mode!="idle"}[2m]))) > 0.8) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 10m
               - name: Host CPU is underutilized
-                description: "CPU load has been < 20% for 1 week. Consider reducing the number of CPUs."
-                query: '(min by (instance) (rate(node_cpu_seconds_total{mode="idle"}[1h]))) > 0.8'
+                description: "CPU load is < 20% for 1 week. Consider reducing the number of CPUs."
+                query: '(100 - (rate(node_cpu_seconds_total{mode="idle"}[30m]) * 100) < 20) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: info
+                for: 1w
                 comments: |
                   You may want to increase the alert manager 'repeat_interval' for this type of alert to daily or weekly
-                for: 1w
               - name: Host CPU steal noisy neighbor
                 description: CPU steal is > 10%. A noisy neighbor is killing VM performances or a spot instance may be out of credit.
-                query: 'avg by(instance) (rate(node_cpu_seconds_total{mode="steal"}[5m])) * 100 > 10'
+                query: '(avg by(instance) (rate(node_cpu_seconds_total{mode="steal"}[5m])) * 100 > 10) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
               - name: Host CPU high iowait
-                description: CPU iowait > 10%. Your CPU is idling waiting for storage to respond.
-                query: 'avg by (instance) (rate(node_cpu_seconds_total{mode="iowait"}[5m])) > .10'
+                description: CPU iowait > 10%. A high iowait means that you are disk or network bound.
+                query: '(avg by (instance) (rate(node_cpu_seconds_total{mode="iowait"}[5m])) * 100 > 10) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
               - name: Host unusual disk IO
-                description: "Disk usage >80%. Check storage for issues or increase IOPS capabilities."
-                query: 'rate(node_disk_io_time_seconds_total[5m]) > 0.8'
+                description: "Time spent in IO is too high on {{ $labels.instance }}. Check storage for issues."
+                query: '(rate(node_disk_io_time_seconds_total[1m]) > 0.5) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 5m
               - name: Host context switching high
                 description: Context switching is growing on the node (twice the daily average during the last 15m)
-                query: |
-                  (rate(node_context_switches_total[15m])/count without(mode,cpu) (node_cpu_seconds_total{mode="idle"}))
-                  /
-                  (rate(node_context_switches_total[1d])/count without(mode,cpu) (node_cpu_seconds_total{mode="idle"})) > 2
+                query: '(rate(node_context_switches_total[15m])/count without(mode,cpu) (node_cpu_seconds_total{mode="idle"})) / (rate(node_context_switches_total[1d])/count without(mode,cpu) (node_cpu_seconds_total{mode="idle"})) > 2'
                 severity: warning
                 comments: |
                   x2 context switches is an arbitrary number.
@@ -251,84 +250,86 @@ groups:
                   Please read: https://github.com/samber/awesome-prometheus-alerts/issues/58
               - name: Host swap is filling up
                 description: Swap is filling up (>80%)
-                query: '((1 - (node_memory_SwapFree_bytes / node_memory_SwapTotal_bytes)) * 100 > 80)'
+                query: '((1 - (node_memory_SwapFree_bytes / node_memory_SwapTotal_bytes)) * 100 > 80) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 2m
               - name: Host systemd service crashed
                 description: "systemd service crashed"
-                query: '(node_systemd_unit_state{state="failed"} == 1)'
+                query: '(node_systemd_unit_state{state="failed"} == 1) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
               - name: Host physical component too hot
                 description: "Physical hardware component too hot"
-                # Some components have different max temperatures (eg. 65 for hard drive sensors, 90-100 for CPU).
-                # This is defined for all sensors, the crit value may not be defined for everything.
-                query: 'node_hwmon_temp_celsius > node_hwmon_temp_max_celsius'
+                query: '((node_hwmon_temp_celsius * ignoring(label) group_left(instance, job, node, sensor) node_hwmon_sensor_label{label!="tctl"} > 75)) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 5m
               - name: Host node overtemperature alarm
                 description: "Physical node temperature alarm triggered"
                 query: '((node_hwmon_temp_crit_alarm_celsius == 1) or (node_hwmon_temp_alarm == 1)) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: critical
-              - name: Host Software RAID insufficient drives
-                description: "MD RAID array {{ $labels.device }} on {{ $labels.instance }} has insufficient drives remaining."
-                query: '((node_md_disks_required - on(device, instance) node_md_disks{state="active"}) > 0)'
+              - name: Host RAID array got inactive
+                description: "RAID array {{ $labels.device }} is in a degraded state due to one or more disk failures. The number of spare drives is insufficient to fix the issue automatically."
+                query: '(node_md_state{state="inactive"} > 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: critical
-              - name: Host Software RAID disk failure
-                description: "MD RAID array {{ $labels.device }} on {{ $labels.instance }} needs attention."
-                query: '(node_md_disks{state="failed"} > 0)'
+              - name: Host RAID disk failure
+                description: "At least one device in RAID array on {{ $labels.instance }} failed. Array {{ $labels.md_device }} needs attention and possibly a disk swap"
+                query: '(node_md_disks{state="failed"} > 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 2m
               - name: Host kernel version deviations
-                description: Kernel version for {{ $labels.instance }} has changed
-                query: 'changes(node_uname_info[1h]) > 0'
-                comments: |
-                  This alert may happen when the host is rebooted after a software update.
-                severity: info
+                description: Different kernel versions are running
+                query: '(count(sum(label_replace(node_uname_info, "kernel", "$1", "release", "([0-9]+.[0-9]+.[0-9]+).*")) by (kernel)) > 1) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
+                severity: warning
+                for: 6h
               - name: Host OOM kill detected
                 description: OOM kill detected
-                query: '(increase(node_vmstat_oom_kill[1m]) > 0)'
-                severity: critical
+                query: '(increase(node_vmstat_oom_kill[1m]) > 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
+                severity: warning
               - name: Host EDAC Correctable Errors detected
                 description: 'Host {{ $labels.instance }} has had {{ printf "%.0f" $value }} correctable memory errors reported by EDAC in the last 5 minutes.'
-                query: '(increase(node_edac_correctable_errors_total[1m]) > 0)'
+                query: '(increase(node_edac_correctable_errors_total[1m]) > 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: info
               - name: Host EDAC Uncorrectable Errors detected
                 description: 'Host {{ $labels.instance }} has had {{ printf "%.0f" $value }} uncorrectable memory errors reported by EDAC in the last 5 minutes.'
-                query: '(node_edac_uncorrectable_errors_total > 0)'
+                query: '(node_edac_uncorrectable_errors_total > 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
               - name: Host Network Receive Errors
                 description: 'Host {{ $labels.instance }} interface {{ $labels.device }} has encountered {{ printf "%.0f" $value }} receive errors in the last two minutes.'
-                query: '(rate(node_network_receive_errs_total[2m]) / rate(node_network_receive_packets_total[2m]) > 0.01)'
+                query: '(rate(node_network_receive_errs_total[2m]) / rate(node_network_receive_packets_total[2m]) > 0.01) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 2m
               - name: Host Network Transmit Errors
                 description: 'Host {{ $labels.instance }} interface {{ $labels.device }} has encountered {{ printf "%.0f" $value }} transmit errors in the last two minutes.'
-                query: '(rate(node_network_transmit_errs_total[2m]) / rate(node_network_transmit_packets_total[2m]) > 0.01)'
+                query: '(rate(node_network_transmit_errs_total[2m]) / rate(node_network_transmit_packets_total[2m]) > 0.01) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 2m
+              - name: Host Network Interface Saturated
+                description: 'The network interface "{{ $labels.device }}" on "{{ $labels.instance }}" is getting overloaded.'
+                query: '((rate(node_network_receive_bytes_total{device!~"^tap.*|^vnet.*|^veth.*|^tun.*"}[1m]) + rate(node_network_transmit_bytes_total{device!~"^tap.*|^vnet.*|^veth.*|^tun.*"}[1m])) / node_network_speed_bytes{device!~"^tap.*|^vnet.*|^veth.*|^tun.*"} > 0.8 < 10000) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}' # < to 10Gb to prevent +inf when max speed is unknown
+                severity: warning
+                for: 1m
               - name: Host Network Bond Degraded
                 description: 'Bond "{{ $labels.device }}" degraded on "{{ $labels.instance }}".'
-                query: '((node_bonding_active - node_bonding_slaves) != 0)'
+                query: '((node_bonding_active - node_bonding_slaves) != 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 2m
               - name: Host conntrack limit
                 description: "The number of conntrack is approaching limit"
-                query: '(node_nf_conntrack_entries / node_nf_conntrack_entries_limit > 0.8)'
+                query: '(node_nf_conntrack_entries / node_nf_conntrack_entries_limit > 0.8) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 5m
               - name: Host clock skew
                 description: "Clock skew detected. Clock is out of sync. Ensure NTP is configured correctly on this host."
-                query: '((node_timex_offset_seconds > 0.05 and deriv(node_timex_offset_seconds[5m]) >= 0) or (node_timex_offset_seconds < -0.05 and deriv(node_timex_offset_seconds[5m]) <= 0))'
+                query: '((node_timex_offset_seconds > 0.05 and deriv(node_timex_offset_seconds[5m]) >= 0) or (node_timex_offset_seconds < -0.05 and deriv(node_timex_offset_seconds[5m]) <= 0)) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 10m
               - name: Host clock not synchronising
                 description: "Clock not synchronising. Ensure NTP is configured on this host."
-                query: '(min_over_time(node_timex_sync_status[1m]) == 0 and node_timex_maxerror_seconds >= 16)'
+                query: '(min_over_time(node_timex_sync_status[1m]) == 0 and node_timex_maxerror_seconds >= 16) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: warning
                 for: 2m
               - name: Host requires reboot
                 description: "{{ $labels.instance }} requires a reboot."
-                query: '(node_reboot_required > 0)'
+                query: '(node_reboot_required > 0) * on(instance) group_left (nodename) node_uname_info{nodename=~".+"}'
                 severity: info
                 for: 4h
 
@@ -338,42 +339,31 @@ groups:
             slug: smartctl-exporter
             doc_url: https://github.com/prometheus-community/smartctl_exporter
             rules:
-              - name: SMART device temperature warning
-                description: Device temperature warning on {{ $labels.instance }} drive {{ $labels.device }} over 60°C
-                query: (avg_over_time(smartctl_device_temperature{temperature_type="current"} [5m]) unless on (instance, device) smartctl_device_temperature{temperature_type="drive_trip"}) > 60
+              - name: Smart device temperature warning
+                description: Device temperature  warning (instance {{ $labels.instance }})
+                query: smartctl_device_temperature > 60
                 severity: warning
-              - name: SMART device temperature critical
-                description: Device temperature critical on {{ $labels.instance }} drive {{ $labels.device }} over 70°C
-                query: (max_over_time(smartctl_device_temperature{temperature_type="current"} [5m]) unless on (instance, device) smartctl_device_temperature{temperature_type="drive_trip"}) > 70
+                for: 2m
+              - name: Smart device temperature critical
+                description: Device temperature critical  (instance {{ $labels.instance }})
+                query: smartctl_device_temperature > 80
                 severity: critical
-              # Datacenter drives have a trip temperature
-              - name: SMART device temperature over trip value
-                description: Device temperature over trip value on {{ $labels.instance }} drive {{ $labels.device }})
-                query: max_over_time(smartctl_device_temperature{temperature_type="current"} [10m]) >= on(device, instance) smartctl_device_temperature{temperature_type="drive_trip"}
-                severity: critical
-              - name: SMART device temperature nearing trip value
-                description: Device temperature at 80% of trip value on {{ $labels.instance }} drive {{ $labels.device }})
-                query: max_over_time(smartctl_device_temperature{temperature_type="current"} [10m]) >= on(device, instance) (smartctl_device_temperature{temperature_type="drive_trip"} * .80)
-                severity: warning
-              - name: SMART status
-                description: Device has a SMART status failure on {{ $labels.instance }} drive {{ $labels.device }})
-                query: smartctl_device_smart_status != 1
-                severity: critical
-              - name: SMART critical warning
-                description: Disk controller has critical warning on {{ $labels.instance }} drive {{ $labels.device }})
+                for: 2m
+              - name: Smart critical warning
+                description: device has critical warning (instance {{ $labels.instance }})
                 query: smartctl_device_critical_warning > 0
                 severity: critical
-              - name: SMART media errors
-                description: Disk controller detected media errors on {{ $labels.instance }} drive {{ $labels.device }})
+                for: 15m
+              - name: Smart media errors
+                description: device has media errors (instance {{ $labels.instance }})
                 query: smartctl_device_media_errors > 0
                 severity: critical
-                comments: |
-                  Media errors are a sign of a failing disk. Replace the disk as soon as possible.
-              - name: SMART Wearout Indicator
-                description: Device is wearing out on {{ $labels.instance }} drive {{ $labels.device }})
-                # The threshold is not present on devices that do not support it
-                query: smartctl_device_available_spare < smartctl_device_available_spare_threshold
+                for: 15m
+              - name: Smart NVME Wearout Indicator
+                description: NVMe device is wearing out (instance {{ $labels.instance }})
+                query: smartctl_device_available_spare{device=~"nvme.*"} < smartctl_device_available_spare_threshold{device=~"nvme.*"}
                 severity: critical
+                for: 15m
 
       - name: Docker containers
         exporters:
@@ -552,7 +542,7 @@ groups:
                 for: 5m
               - name: Netdata high memory usage
                 description: Netdata high memory usage (> 80%)
-                query: '100 / netdata_system_ram_MB_average * netdata_system_ram_MB_average{dimension=~"free|cached"} < 20'
+                query: '100 / netdata_system_ram_MiB_average * netdata_system_ram_MiB_average{dimension=~"free|cached"} < 20'
                 severity: warning
                 for: 5m
               - name: Netdata low disk space
@@ -654,27 +644,24 @@ groups:
                 description: Postgresql exporter is showing errors. A query may be buggy in query.yaml
                 query: "pg_exporter_last_scrape_error > 0"
                 severity: critical
-                # With modern PostgreSQL versions, auto-vacuum doesn't run if it is not required, only after a certain number of tuples have been modified.
               - name: Postgresql table not auto vacuumed
                 description: Table {{ $labels.relname }} has not been auto vacuumed for 10 days
-                query: "((pg_stat_user_tables_n_tup_del + pg_stat_user_tables_n_tup_upd + pg_stat_user_tables_n_tup_hot_upd) > pg_settings_autovacuum_vacuum_threshold) and (time() - pg_stat_user_tables_last_autovacuum) > 864000"
+                query: "(pg_stat_user_tables_last_autovacuum > 0) and (time() - pg_stat_user_tables_last_autovacuum) > 60 * 60 * 24 * 10"
                 severity: warning
               - name: Postgresql table not auto analyzed
                 description: Table {{ $labels.relname }} has not been auto analyzed for 10 days
-                query: "((pg_stat_user_tables_n_tup_del + pg_stat_user_tables_n_tup_upd + pg_stat_user_tables_n_tup_hot_upd) > pg_settings_autovacuum_analyze_threshold) and (time() - pg_stat_user_tables_last_autoanalyze) > 864000"
+                query: "(pg_stat_user_tables_last_autoanalyze > 0) and (time() - pg_stat_user_tables_last_autoanalyze) > 24 * 60 * 60 * 10"
                 severity: warning
               - name: Postgresql too many connections
                 description: PostgreSQL instance has too many connections (> 80%).
                 query: "sum by (instance, job, server) (pg_stat_activity_count) > min by (instance, job, server) (pg_settings_max_connections * 0.8)"
-                severity: critical
+                severity: warning
                 for: 2m
               - name: Postgresql not enough connections
                 description: PostgreSQL instance should have more connections (> 5)
                 query: 'sum by (datname) (pg_stat_activity_count{datname!~"template.*|postgres"}) < 5'
-                severity: critical
+                severity: warning
                 for: 2m
-                comments: |
-                  If the number of connections is too low, it may indicate that the application has died.
               - name: Postgresql dead locks
                 description: PostgreSQL has dead-locks
                 query: 'increase(pg_stat_database_deadlocks{datname!~"template.*|postgres"}[1m]) > 5'
@@ -685,9 +672,9 @@ groups:
                 severity: warning
               - name: Postgresql commit rate low
                 description: Postgresql seems to be processing very few transactions
-                query: 'increase(pg_stat_database_xact_commit{datname!~"template.*|postgres",datid!="0"}[5m]) < 5'
+                query: "rate(pg_stat_database_xact_commit[1m]) < 10"
                 severity: critical
-                for: 5m
+                for: 2m
               - name: Postgresql low XID consumption
                 description: Postgresql seems to be consuming transaction IDs very slowly
                 query: "rate(pg_txid_current[1m]) < 5"
@@ -713,15 +700,12 @@ groups:
                 for: 2m
               - name: Postgresql configuration changed
                 description: Postgres Database configuration change has occurred
-                query: 'changes(label_replace({__name__=~"pg_settings_.*"},"name","$1","__name__", "(.+)")[1h:]) > 0'
+                query: '{__name__=~"pg_settings_.*"} != ON(__name__, instance) {__name__=~"pg_settings_([^t]|t[^r]|tr[^a]|tra[^n]|tran[^s]|trans[^a]|transa[^c]|transac[^t]|transact[^i]|transacti[^o]|transactio[^n]|transaction[^_]|transaction_[^r]|transaction_r[^e]|transaction_re[^a]|transaction_rea[^d]|transaction_read[^_]|transaction_read_[^o]|transaction_read_o[^n]|transaction_read_on[^l]|transaction_read_onl[^y]).*"} OFFSET 5m'
                 severity: info
               - name: Postgresql SSL compression active
-                description: Database allows connections with SSL compression enabled.
+                description: Database connections with SSL compression enabled. This may add significant jitter in replication delay. Replicas should turn off SSL compression via `sslcompression=0` in `recovery.conf`.
                 query: "sum(pg_stat_ssl_compression) > 0"
                 severity: critical
-                comments: |
-                  TLS compression is a security risk and should be disabled. It has been removed for TLSv1.3.
-                  https://www.bytebase.com/docs/slow-query/enable-pg-stat-statements-for-postgresql/
               - name: Postgresql too many locks acquired
                 description: Too many locks acquired on the database. If this alert happens frequently, we may need to increase the postgres setting max_locks_per_transaction.
                 query: "((sum (pg_locks_count)) / (pg_settings_max_locks_per_transaction * pg_settings_max_connections)) > 0.20"
@@ -982,6 +966,11 @@ groups:
                 query: "rabbitmq_process_open_fds / rabbitmq_process_max_fds * 100 > 90"
                 severity: warning
                 for: 2m
+              - name: RabbitMQ too many ready messages
+                description: RabbitMQ too many ready messages on {{ $labels.instace }}
+                query: "sum(rabbitmq_queue_messages_ready) BY (queue) > 1000"
+                severity: warning
+                for: 1m
               - name: RabbitMQ too many unack messages
                 description: Too many unacknowledged messages
                 query: "sum(rabbitmq_queue_messages_unacked) BY (queue) > 1000"
@@ -2044,7 +2033,7 @@ groups:
                 for: 2m
               - name: Kubernetes Node out of pod capacity
                 description: "Node {{ $labels.node }} is out of pod capacity"
-                query: 'sum by (node) ((kube_pod_status_phase{phase="Running"} == 1) + on(uid) group_left(node) (0 * kube_pod_info{pod_template_hash=""})) / sum by (node) (kube_node_status_allocatable{resource="pods"}) * 100 > 90'
+                query: 'sum by (node) ((kube_pod_status_phase{phase="Running"} == 1) + on(uid, instance) group_left(node) (0 * kube_pod_info{pod_template_hash=""})) / sum by (node) (kube_node_status_allocatable{resource="pods"}) * 100 > 90'
                 severity: warning
                 for: 2m
               - name: Kubernetes Container oom killer
@@ -2057,6 +2046,11 @@ groups:
                 description: "Job {{ $labels.namespace }}/{{ $labels.job_name }} failed to complete"
                 query: "kube_job_status_failed > 0"
                 severity: warning
+              - name: Kubernetes Job not starting
+                summary: Kubernetes Job not starting ({{ $labels.namespace }}/{{ $labels.job_name }})
+                description: "Job {{ $labels.namespace }}/{{ $labels.job_name }} did not start for 10 minutes"
+                query: "kube_job_status_active == 0 and kube_job_status_failed == 0 and kube_job_status_succeeded == 0 and (time() - kube_job_status_start_time) > 600"
+                severity: warning
               - name: Kubernetes CronJob suspended
                 summary: Kubernetes CronJob suspended ({{ $labels.namespace }}/{{ $labels.cronjob }})
                 description: "CronJob {{ $labels.namespace }}/{{ $labels.cronjob }} is suspended"
@@ -2985,6 +2979,15 @@ groups:
                 severity: critical
                 for: 5m
 
+      - name: Grafana Alloy
+        exporters:
+          - slug: embedded-exporter
+            rules:
+              - name: Grafana Alloy service down
+                description: Alloy on (instance {{ $labels.instance }}) is not responding or has stopped running. 
+                query: 'count by (instance) (alloy_build_info) unless count by (instance) (alloy_build_info offset 2m)  '
+                severity: critical
+
       - name: Jenkins
         exporters:
           - name: Metric plugin
diff --git a/alertmanager.md b/alertmanager.md
index 6b07089..d350945 100644
--- a/alertmanager.md
+++ b/alertmanager.md
@@ -138,4 +138,4 @@ If the notification takes too much time to be triggered, check the following del
 Also read:
 - [https://pracucci.com/prometheus-understanding-the-delays-on-alerting.html](https://pracucci.com/prometheus-understanding-the-delays-on-alerting.html).
 - [https://hodovi.cc/blog/creating-awesome-alertmanager-templates-for-slack/](https://hodovi.cc/blog/creating-awesome-alertmanager-templates-for-slack/)
-
+- [https://grafana.com/blog/2024/10/03/how-to-use-prometheus-to-efficiently-detect-anomalies-at-scale/](https://grafana.com/blog/2024/10/03/how-to-use-prometheus-to-efficiently-detect-anomalies-at-scale/)
diff --git a/dist/rules/grafana-alloy/embedded-exporter.yml b/dist/rules/grafana-alloy/embedded-exporter.yml
new file mode 100644
index 0000000..d86c8a4
--- /dev/null
+++ b/dist/rules/grafana-alloy/embedded-exporter.yml
@@ -0,0 +1,14 @@
+groups:
+
+- name: EmbeddedExporter
+
+  rules:
+
+    - alert: GrafanaAlloyServiceDown
+      expr: 'count by (instance) (alloy_build_info) unless count by (instance) (alloy_build_info offset 2m)  '
+      for: 0m
+      labels:
+        severity: critical
+      annotations:
+        summary: Grafana Alloy service down (instance {{ $labels.instance }})
+        description: "Alloy on (instance {{ $labels.instance }}) is not responding or has stopped running.\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
diff --git a/dist/rules/host-and-hardware/node-exporter.yml b/dist/rules/host-and-hardware/node-exporter.yml
index 89eae23..d52b34d 100644
--- a/dist/rules/host-and-hardware/node-exporter.yml
+++ b/dist/rules/host-and-hardware/node-exporter.yml
@@ -167,10 +167,7 @@ groups:
         description: "Disk usage >80%. Check storage for issues or increase IOPS capabilities.\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
 
     - alert: HostContextSwitchingHigh
-      expr: '(rate(node_context_switches_total[15m])/count without(mode,cpu) (node_cpu_seconds_total{mode="idle"}))
-/
-(rate(node_context_switches_total[1d])/count without(mode,cpu) (node_cpu_seconds_total{mode="idle"})) > 2
-'
+      expr: '(rate(node_context_switches_total[15m])/count without(mode,cpu) (node_cpu_seconds_total{mode="idle"}))/(rate(node_context_switches_total[1d])/count without(mode,cpu) (node_cpu_seconds_total{mode="idle"})) > 2'
       for: 0m
       labels:
         severity: warning
diff --git a/dist/rules/kubernetes/kubestate-exporter.yml b/dist/rules/kubernetes/kubestate-exporter.yml
index 2db1d64..7e32694 100644
--- a/dist/rules/kubernetes/kubestate-exporter.yml
+++ b/dist/rules/kubernetes/kubestate-exporter.yml
@@ -41,7 +41,7 @@ groups:
         description: "Node {{ $labels.node }} has NetworkUnavailable condition\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
 
     - alert: KubernetesNodeOutOfPodCapacity
-      expr: 'sum by (node) ((kube_pod_status_phase{phase="Running"} == 1) + on(uid) group_left(node) (0 * kube_pod_info{pod_template_hash=""})) / sum by (node) (kube_node_status_allocatable{resource="pods"}) * 100 > 90'
+      expr: 'sum by (node) ((kube_pod_status_phase{phase="Running"} == 1) + on(uid, instance) group_left(node) (0 * kube_pod_info{pod_template_hash=""})) / sum by (node) (kube_node_status_allocatable{resource="pods"}) * 100 > 90'
       for: 2m
       labels:
         severity: warning
@@ -67,6 +67,15 @@ groups:
         summary: Kubernetes Job failed ({{ $labels.namespace }}/{{ $labels.job_name }})
         description: "Job {{ $labels.namespace }}/{{ $labels.job_name }} failed to complete\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
 
+    - alert: KubernetesJobNotStarting
+      expr: 'kube_job_status_active == 0 and kube_job_status_failed == 0 and kube_job_status_succeeded == 0 and (time() - kube_job_status_start_time) > 600'
+      for: 0m
+      labels:
+        severity: warning
+      annotations:
+        summary: Kubernetes Job not starting ({{ $labels.namespace }}/{{ $labels.job_name }})
+        description: "Job {{ $labels.namespace }}/{{ $labels.job_name }} did not start for 10 minutes\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
+
     - alert: KubernetesCronjobSuspended
       expr: 'kube_cronjob_spec_suspend != 0'
       for: 0m
diff --git a/dist/rules/netdata/embedded-exporter.yml b/dist/rules/netdata/embedded-exporter.yml
index 7d21766..8c57745 100644
--- a/dist/rules/netdata/embedded-exporter.yml
+++ b/dist/rules/netdata/embedded-exporter.yml
@@ -23,7 +23,7 @@ groups:
         description: "CPU steal is > 10%. A noisy neighbor is killing VM performances or a spot instance may be out of credit.\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
 
     - alert: NetdataHighMemoryUsage
-      expr: '100 / netdata_system_ram_MB_average * netdata_system_ram_MB_average{dimension=~"free|cached"} < 20'
+      expr: '100 / netdata_system_ram_MiB_average * netdata_system_ram_MiB_average{dimension=~"free|cached"} < 20'
       for: 5m
       labels:
         severity: warning
diff --git a/dist/rules/postgresql/postgres-exporter.yml b/dist/rules/postgresql/postgres-exporter.yml
index 5cc6e03..692acef 100644
--- a/dist/rules/postgresql/postgres-exporter.yml
+++ b/dist/rules/postgresql/postgres-exporter.yml
@@ -140,7 +140,7 @@ groups:
         description: "PostgreSQL dead tuples is too large\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
 
     - alert: PostgresqlConfigurationChanged
-      expr: 'changes(label_replace({__name__=~"pg_settings_.*"},"name","$1","__name__", "(.+)")[1h:]) > 0'
+      expr: '{__name__=~"pg_settings_.*"} != ON(__name__, instance) {__name__=~"pg_settings_([^t]|t[^r]|tr[^a]|tra[^n]|tran[^s]|trans[^a]|transa[^c]|transac[^t]|transact[^i]|transacti[^o]|transactio[^n]|transaction[^_]|transaction_[^r]|transaction_r[^e]|transaction_re[^a]|transaction_rea[^d]|transaction_read[^_]|transaction_read_[^o]|transaction_read_o[^n]|transaction_read_on[^l]|transaction_read_onl[^y]).*"} OFFSET 5m'
       for: 0m
       labels:
         severity: info
diff --git a/dist/rules/rabbitmq/rabbitmq-exporter.yml b/dist/rules/rabbitmq/rabbitmq-exporter.yml
index be95359..10823d2 100644
--- a/dist/rules/rabbitmq/rabbitmq-exporter.yml
+++ b/dist/rules/rabbitmq/rabbitmq-exporter.yml
@@ -49,6 +49,15 @@ groups:
         summary: RabbitMQ file descriptors usage (instance {{ $labels.instance }})
         description: "A node use more than 90% of file descriptors\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
 
+    - alert: RabbitmqTooManyReadyMessages
+      expr: 'sum(rabbitmq_queue_messages_ready) BY (queue) > 1000'
+      for: 1m
+      labels:
+        severity: warning
+      annotations:
+        summary: RabbitMQ too many ready messages (instance {{ $labels.instance }})
+        description: "RabbitMQ too many ready messages on {{ $labels.instace }}\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
+
     - alert: RabbitmqTooManyUnackMessages
       expr: 'sum(rabbitmq_queue_messages_unacked) BY (queue) > 1000'
       for: 1m