From 4da4bfd7292a9f4c68f4ca11c1d2df634924d13e Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Mon, 11 Dec 2023 13:45:07 +0000 Subject: [PATCH] HPCC-30817 Switch metrics to target audience=monitor Signed-off-by: Gavin Halliday --- system/jlib/jlog.hpp | 2 +- system/metrics/sinks/log/logSink.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system/jlib/jlog.hpp b/system/jlib/jlog.hpp index 3d9abc26eb1..ca142787684 100644 --- a/system/jlib/jlog.hpp +++ b/system/jlib/jlog.hpp @@ -835,7 +835,7 @@ constexpr LogMsgCategory MCuserInfo(MSGAUD_user, MSGCLS_information, InfoMsgThre constexpr LogMsgCategory MCdebugInfo(MSGAUD_programmer, MSGCLS_information, DebugMsgThreshold); constexpr LogMsgCategory MCauditInfo(MSGAUD_audit, MSGCLS_information, AudMsgThreshold); constexpr LogMsgCategory MCoperatorInfo(MSGAUD_operator, MSGCLS_information, InfoMsgThreshold); -constexpr LogMsgCategory MCoperatorMetric(MSGAUD_operator, MSGCLS_metric, ErrMsgThreshold); +constexpr LogMsgCategory MCmonitorMetric(MSGAUD_monitor, MSGCLS_metric, ErrMsgThreshold); constexpr LogMsgCategory MCmonitorEvent(MSGAUD_monitor, MSGCLS_event, ProgressMsgThreshold); /* diff --git a/system/metrics/sinks/log/logSink.cpp b/system/metrics/sinks/log/logSink.cpp index d9ce1b4fc99..30c51eaf922 100644 --- a/system/metrics/sinks/log/logSink.cpp +++ b/system/metrics/sinks/log/logSink.cpp @@ -65,7 +65,7 @@ void LogMetricSink::writeLogEntry(const std::shared_ptr &pMetric) { name.append(".").append(unitsStr); } - LOG(MCoperatorMetric, "name=%s,value=%" I64F "d", name.c_str(), metricValue); + LOG(MCmonitorMetric, "name=%s,value=%" I64F "d", name.c_str(), metricValue); } } else @@ -84,20 +84,20 @@ void LogMetricSink::writeLogEntry(const std::shared_ptr &pMetric) cumulative += values[i]; if (!ignoreZeroMetrics || values[i]) { - LOG(MCoperatorMetric, "name=%s, bucket le %" I64F "d=%" I64F "d", name.c_str(), limits[i], cumulative); + LOG(MCmonitorMetric, "name=%s, bucket le %" I64F "d=%" I64F "d", name.c_str(), limits[i], cumulative); } } // The inf bucket count is the last element in the array of values returned. // Add it to the cumulative count and print the value cumulative += values[countBucketValues - 1]; - LOG(MCoperatorMetric, "name=%s, bucket inf=%" I64F "d", name.c_str(), cumulative); + LOG(MCmonitorMetric, "name=%s, bucket inf=%" I64F "d", name.c_str(), cumulative); // sum - total of all observations - LOG(MCoperatorMetric, "name=%s, sum=%" I64F "d", name.c_str(), sum); + LOG(MCmonitorMetric, "name=%s, sum=%" I64F "d", name.c_str(), sum); // count - total of all bucket counts (same as inf) - LOG(MCoperatorMetric, "name=%s, count=%" I64F "d", name.c_str(), cumulative); + LOG(MCmonitorMetric, "name=%s, count=%" I64F "d", name.c_str(), cumulative); } } }