Merge remote-tracking branch 'origin/master' into kckyeung/bounded-identity

Author: KiChjang

.editorconfig

@@ -9,6 +9,11 @@ trim_trailing_whitespace=true
 max_line_length=100
 insert_final_newline=true
 
+[*.md]
+max_line_length=80
+indent_style=space
+indent_size=2
+
 [*.yml]
 indent_style=space
 indent_size=2

.maintain/monitoring/alerting-rules/alerting-rules.yaml

@@ -47,8 +47,8 @@ groups:
     # Under the assumption of an average block production of 6 seconds,
     # "best" and "finalized" being more than 10 blocks apart would imply
     # more than a 1 minute delay between block production and finalization.
-    expr: '(polkadot_block_height_number{status="best"} - ignoring(status)
-    polkadot_block_height_number{status="finalized"}) > 10'
+    expr: '(polkadot_block_height{status="best"} - ignoring(status)
+    polkadot_block_height{status="finalized"}) > 10'
     for: 8m
     labels:
       severity: critical
@@ -134,7 +134,7 @@ groups:
   ##############################################################################
 
   - alert: ContinuousTaskEnded
-    expr: '(polkadot_tasks_spawned_total{task_name != "basic-authorship-proposer"} == 1)
+    expr: '(polkadot_tasks_spawned_total{task_name != "basic-authorship-proposer", task_name != "substrate-rpc-subscription"} == 1)
         - on(instance, task_name) group_left() (polkadot_tasks_ended_total == 1)'
     for: 5m
     labels: