Merge "Document executor/merger stats" into feature/zuulv3
diff --git a/doc/source/admin/monitoring.rst b/doc/source/admin/monitoring.rst
index 55f1908..e6e6139 100644
--- a/doc/source/admin/monitoring.rst
+++ b/doc/source/admin/monitoring.rst
@@ -224,6 +224,49 @@
The number of outstanding nodepool requests from Zuul.
+.. stat:: zuul.mergers
+
+ Holds metrics related to Zuul mergers.
+
+ .. stat:: online
+ :type: gauge
+
+ The number of Zuul merger processes online.
+
+ .. stat:: jobs_running
+ :type: gauge
+
+ The number of merge jobs running.
+
+ .. stat:: jobs_queued
+ :type: gauge
+
+ The number of merge jobs queued.
+
+.. stat:: zuul.executors
+
+ Holds metrics related to Zuul executors.
+
+ .. stat:: online
+ :type: gauge
+
+ The number of Zuul executor processes online.
+
+ .. stat:: accepting
+ :type: gauge
+
+ The number of Zuul executor processes accepting new jobs.
+
+ .. stat:: jobs_running
+ :type: gauge
+
+ The number of executor jobs running.
+
+ .. stat:: jobs_queued
+ :type: gauge
+
+ The number of executor jobs queued.
+
As an example, given a job named `myjob` in `mytenant` triggered by a
change to `myproject` on the `master` branch in the `gate` pipeline
diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index c0915ed..8db9e46 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -214,7 +214,7 @@
"""
log = logging.getLogger("zuul.Scheduler")
- _stats_interval = 10
+ _stats_interval = 30
def __init__(self, config, testonly=False):
threading.Thread.__init__(self)