Merge pull request #1918 from lsst-sqre/tickets/DM-37649

tickets/DM-37649
lsst-sqre · Jan 30, 2023 · f22afc8 · f22afc8
2 parents 94c4980 + 5942d29
commit f22afc8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/services/cachemachine/values-tucson-teststand.yaml b/services/cachemachine/values-tucson-teststand.yaml
@@ -8,11 +8,11 @@ autostart:
           "type": "RubinRepoMan",
           "registry_url": "ts-dockerhub.lsst.org",
           "repo": "sal-sciplat-lab",
-          "recommended_tag": "recommended_c0028",
+          "recommended_tag": "recommended_c0029",
           "num_releases": 1,
           "num_weeklies": 3,
           "num_dailies": 2,
-          "cycle": 28,
+          "cycle": 29,
           "alias_tags": [
               "latest",
               "latest_daily",

diff --git a/services/sasquatch/values-tucson-teststand.yaml b/services/sasquatch/values-tucson-teststand.yaml
@@ -43,15 +43,15 @@ telegraf-kafka-consumer:
     comcam:
       enabled: true
       topicRegexps: |
-        [ ".*CCArchiver", ".*CCCamera", ".*CCHeaderService", ".*CCOODS" ]
+        [ ".*CCCamera", ".*CCHeaderService", ".*CCOODS" ]
     eas:
       enabled: true
       topicRegexps: |
-        [ ".*DIMM", ".*DSM", ".*WeatherStation" ]
+        [ ".*DIMM", ".*DSM", ".*WeatherForecast", ".*WeatherStation" ]
     latiss:
       enabled: true
       topicRegexps: |
-        [ ".*ATArchiver", ".*ATCamera", ".*ATHeaderService", ".*ATOODS", ".*ATSpectrograph" ]
+        [ ".*ATCamera", ".*ATHeaderService", ".*ATOODS", ".*ATSpectrograph" ]
     m1m3:
       enabled: true
       flush_interval: "0.1s"
@@ -86,10 +86,10 @@ telegraf-kafka-consumer:
       enabled: true
       topicRegexps: |
         [ ".*Authorize" ]
-    mtalignment:
+    lasertracker:
       enabled: true
       topicRegexps: |
-        [ ".*MTAlignment" ]
+        [ ".*LaserTracker" ]
     test:
       enabled: true
       topicRegexps: |
@@ -115,13 +115,13 @@ kafka-connect-manager:
         topicsRegex: ".*MTMount"
       comcam:
         enabled: true
-        topicsRegex: ".*CCArchiver|.*CCCamera|.*CCHeaderService|.*CCOODS"
+        topicsRegex: ".*CCCamera|.*CCHeaderService|.*CCOODS"
       eas:
         enabled: true
-        topicsRegex: ".*DIMM|.*DSM|.*WeatherStation"
+        topicsRegex: ".*DIMM|.*DSM|.*WeatherForecast|.*WeatherStation"
       latiss:
         enabled: true
-        topicsRegex: ".*ATArchiver|.*ATCamera|.*ATHeaderService|.*ATOODS|.*ATSpectrograph"
+        topicsRegex: ".*ATCamera|.*ATHeaderService|.*ATOODS|.*ATSpectrograph"
       m1m3:
         enabled: true
         topicsRegex: ".*MTM1M3"
@@ -149,9 +149,9 @@ kafka-connect-manager:
       authorize:
         enabled: true
         topicsRegex: ".*Authorize"
-      mtalignment:
+      lasertracker:
         enabled: true
-        topicsRegex: ".*MTAlignment"
+        topicsRegex: ".*LaserTracker"
       genericcamera:
         enabled: true
         topicsRegex: ".*GCHeaderService|.*GenericCamera"