Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-30817 Switch metrics to target audience=monitor #18022

Merged
merged 1 commit into from
Dec 12, 2023
Merged

HPCC-30817 Switch metrics to target audience=monitor #18022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion system/jlib/jlog.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/*
Expand Down
10 changes: 5 additions & 5 deletions system/metrics/sinks/log/logSink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void LogMetricSink::writeLogEntry(const std::shared_ptr<IMetric> &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
Expand All @@ -84,20 +84,20 @@ void LogMetricSink::writeLogEntry(const std::shared_ptr<IMetric> &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);
}
}
}
Loading