3 files changed, 45 insertions, 1 deletions

diff --git a/docs/TIME.md b/docs/TIME.md
index f48c080..18773e0 100644
--- a/docs/TIME.md
+++ b/docs/TIME.md
@@ -4,7 +4,7 @@
 
 This collector is intended for usage with local NTPD like [ntp.org](http://ntp.org/), [chrony](https://chrony.tuxfamily.org/comparison.html) or [OpenNTPD](http://www.openntpd.org/).
 
-Note, some chrony packages have `local stratum 10` configuration value making chrony a valid server when it it is unsynchronised. This configuration makes one of `node_ntp_sanity` heuristics unreliable.
+Note, some chrony packages have `local stratum 10` configuration value making chrony a valid server when it is unsynchronised. This configuration makes one of `node_ntp_sanity` heuristics unreliable.
 
 Note, OpenNTPD does not listen for SNTP queries by default, you should add `listen on 127.0.0.1` configuration line to use this collector with OpenNTPD.
 
diff --git a/docs/example-16-compatibility-rules-new-to-old.yml b/docs/example-16-compatibility-rules-new-to-old.yml
index 6d630cc..54aaa27 100644
--- a/docs/example-16-compatibility-rules-new-to-old.yml
+++ b/docs/example-16-compatibility-rules-new-to-old.yml
@@ -11,6 +11,8 @@ groups:
   rules:
   - expr: node_boot_time_seconds
     record: node_boot_time
+  - expr: node_time_seconds
+    record: node_time
   - expr: node_context_switches_total
     record: node_context_switches
   - expr: node_forks_total
@@ -117,6 +119,10 @@ groups:
     record: node_memory_PageTables
   - expr: node_memory_Shmem_bytes
     record: node_memory_Shmem
+  - expr: node_memory_ShmemHugePages_bytes
+    record: node_memory_ShmemHugePages
+  - expr: node_memory_ShmemPmdMapped_bytes
+    record: node_memory_ShmemPmdMapped
   - expr: node_memory_Slab_bytes
     record: node_memory_Slab
   - expr: node_memory_SReclaimable_bytes
diff --git a/docs/node-mixin/alerts/alerts.libsonnet b/docs/node-mixin/alerts/alerts.libsonnet
index caef02d..9ef18d5 100644
--- a/docs/node-mixin/alerts/alerts.libsonnet
+++ b/docs/node-mixin/alerts/alerts.libsonnet
@@ -210,6 +210,44 @@
               severity: 'warning',
             },
           },
+          {
+            alert: 'NodeClockSkewDetected',
+            expr: |||
+              (
+                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
+              )
+            ||| % $._config,
+            'for': '10m',
+            labels: {
+              severity: 'warning',
+            },
+            annotations: {
+              summary: 'Clock skew detected.',
+              message: 'Clock on {{ $labels.instance }} is out of sync by more than 300s. Ensure NTP is configured correctly on this host.',
+            },
+          },
+          {
+            alert: 'NodeClockNotSynchronising',
+            expr: |||
+              min_over_time(node_timex_sync_status[5m]) == 0
+            ||| % $._config,
+            'for': '10m',
+            labels: {
+              severity: 'warning',
+            },
+            annotations: {
+              summary: 'Clock not synchronising.',
+              message: 'Clock on {{ $labels.instance }} is not synchronising. Ensure NTP is configured on this host.',
+            },
+          },
         ],
       },
     ],