From 61a37e427811b5df342469381da36049d4b009d0 Mon Sep 17 00:00:00 2001
From: Mike Langmayr <michael.langmayr@gmail.com>
Date: Mon, 26 Oct 2026 18:08:42 -0700
Subject: [PATCH] Collect pdu1 and rcam heaters in the keygrabber and write to
 the LRIS2 bucket

---
 config/common/keygrabber.yaml | 22 +++++++++++++++++-----
 pyproject.toml                |  3 ++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/config/common/keygrabber.yaml b/config/common/keygrabber.yaml
index d962b27..035437c 100644
--- a/config/common/keygrabber.yaml
+++ b/config/common/keygrabber.yaml
@@ -1,7 +1,7 @@
 # Keyword archiver: polls the LRIS2 daemons and writes to InfluxDB for Grafana
 #
 # Usage:
-#   daemons/keygrabber -c config/lris2_keygrabber.yaml
+#   daemons/keygrabber -c config/common/keygrabber.yaml
 #
 # The InfluxDB token comes from the environment variable named in token_env.
 
@@ -11,8 +11,8 @@ group_id: lris2
 sink:
   type: influxdb
   url: http://meridian.caltech.edu:8086
-  org: coo
-  bucket: lris2
+  org: caltech
+  bucket: LRIS2
   token_env: LRIS2_INFLUX_TOKEN
 
 # Reads run concurrently across peers; a single daemon still answers one at a time
@@ -26,15 +26,27 @@ defaults:
 # "%" takes everything readable except uptime and lasterror, which libby excludes
 collections:
 
-  # Vacuum and cryo: slow-moving, the trend over a cooldown is the point
+  # Pressure moves fast during a pumpdown; the cooler trend is slow
   rpress:
     peer: lris2.rpress
     keywords: ["%"]
-    interval_s: 60.0
+    interval_s: 10.0
   rcryo:
     peer: lris2.rcryo
     keywords: ["%"]
     interval_s: 60.0
 
+  # HeaterX setpoints, outputs and temperatures; bias keywords still report
+  # their commanded values, so they are left out
+  rcam:
+    peer: lris2.rcam
+    keywords: ["heaterx%"]
+
+  # One telnet query per keyword, so a batch of 32 takes a couple of seconds
+  pdu1:
+    peer: l2power.pdu1
+    keywords: ["state%", "current%", "power%", "energy%"]
+    timeout_s: 10.0
+
 logging:
   level: INFO
diff --git a/pyproject.toml b/pyproject.toml
index 4ed1dfd..d2753d3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,8 @@ license = {text = "MIT"}
 readme = "README.md"
 dependencies = [
     "instrumentctl@git+https://github.com/CaltechOpticalObservatories/instrumentctl.git",
-    "libby@git+https://github.com/CaltechOpticalObservatories/libby.git",
+    # influxdb extra: needed by daemons/keygrabber
+    "libby[influxdb]@git+https://github.com/CaltechOpticalObservatories/libby.git",
     "pyyaml",
 ]