Merge pull request #131 from sdmarshall79/metrics-names
Update metric names and allow skipping of specific metrics
This commit is contained in:
Rob Parker
GitHub
@@ -17,103 +17,108 @@ limitations under the License.
|
|||||||
// Package metrics contains code to provide metrics for the queue manager
|
// Package metrics contains code to provide metrics for the queue manager
|
||||||
package metrics
|
package metrics
|
||||||
|
|
||||||
// generateMetricNamesMap generates metric names mapped from their description
|
type metricLookup struct {
|
||||||
func generateMetricNamesMap() map[string]string {
|
name string
|
||||||
|
enabled bool
|
||||||
|
}
|
||||||
|
|
||||||
metricNamesMap := map[string]string{
|
// generateMetricNamesMap generates metric names mapped from their description
|
||||||
"CPU/SystemSummary/CPU load - five minute average": "cpu_load_five_minute_average_percentage",
|
func generateMetricNamesMap() map[string]metricLookup {
|
||||||
"CPU/SystemSummary/CPU load - fifteen minute average": "cpu_load_fifteen_minute_average_percentage",
|
|
||||||
"CPU/SystemSummary/RAM free percentage": "ram_free_percentage",
|
metricNamesMap := map[string]metricLookup{
|
||||||
"CPU/SystemSummary/RAM total bytes": "ram_total_bytes",
|
"CPU/SystemSummary/CPU load - one minute average": metricLookup{"cpu_load_one_minute_average_percentage", true},
|
||||||
"CPU/SystemSummary/User CPU time percentage": "user_cpu_time_percentage",
|
"CPU/SystemSummary/CPU load - five minute average": metricLookup{"cpu_load_five_minute_average_percentage", true},
|
||||||
"CPU/SystemSummary/System CPU time percentage": "system_cpu_time_percentage",
|
"CPU/SystemSummary/CPU load - fifteen minute average": metricLookup{"cpu_load_fifteen_minute_average_percentage", true},
|
||||||
"CPU/SystemSummary/CPU load - one minute average": "cpu_load_one_minute_average_percentage",
|
"CPU/SystemSummary/System CPU time percentage": metricLookup{"system_cpu_time_percentage", true},
|
||||||
"CPU/QMgrSummary/System CPU time - percentage estimate for queue manager": "system_cpu_time_estimate_for_queue_manager_percentage",
|
"CPU/SystemSummary/User CPU time percentage": metricLookup{"user_cpu_time_percentage", true},
|
||||||
"CPU/QMgrSummary/RAM total bytes - estimate for queue manager": "ram_total_estimate_for_queue_manager_bytes",
|
"CPU/SystemSummary/RAM free percentage": metricLookup{"ram_free_percentage", true},
|
||||||
"CPU/QMgrSummary/User CPU time - percentage estimate for queue manager": "user_cpu_time_estimate_for_queue_manager_percentage",
|
"CPU/SystemSummary/RAM total bytes": metricLookup{"system_ram_size_bytes", true},
|
||||||
"DISK/SystemSummary/MQ trace file system - bytes in use": "mq_trace_file_system_in_use_bytes",
|
"CPU/QMgrSummary/System CPU time - percentage estimate for queue manager": metricLookup{"system_cpu_time_estimate_for_queue_manager_percentage", true},
|
||||||
"DISK/SystemSummary/MQ trace file system - free space": "mq_trace_file_system_free_space_percentage",
|
"CPU/QMgrSummary/User CPU time - percentage estimate for queue manager": metricLookup{"user_cpu_time_estimate_for_queue_manager_percentage", true},
|
||||||
"DISK/SystemSummary/MQ errors file system - bytes in use": "mq_errors_file_system_in_use_bytes",
|
"CPU/QMgrSummary/RAM total bytes - estimate for queue manager": metricLookup{"ram_usage_estimate_for_queue_manager_bytes", true},
|
||||||
"DISK/SystemSummary/MQ errors file system - free space": "mq_errors_file_system_free_space_percentage",
|
"DISK/SystemSummary/MQ trace file system - free space": metricLookup{"trace_file_system_free_space_percentage", true},
|
||||||
"DISK/SystemSummary/MQ FDC file count": "mq_fdc_file_count",
|
"DISK/SystemSummary/MQ trace file system - bytes in use": metricLookup{"trace_file_system_in_use_bytes", true},
|
||||||
"DISK/QMgrSummary/Queue Manager file system - bytes in use": "queue_manager_file_system_in_use_bytes",
|
"DISK/SystemSummary/MQ errors file system - free space": metricLookup{"errors_file_system_free_space_percentage", true},
|
||||||
"DISK/QMgrSummary/Queue Manager file system - free space": "queue_manager_file_system_free_space_percentage",
|
"DISK/SystemSummary/MQ errors file system - bytes in use": metricLookup{"errors_file_system_in_use_bytes", true},
|
||||||
"DISK/Log/Log - bytes occupied by reusable extents": "log_occupied_by_reusable_extents_bytes",
|
"DISK/SystemSummary/MQ FDC file count": metricLookup{"fdc_files", true},
|
||||||
"DISK/Log/Log - write size": "log_write_size_bytes",
|
"DISK/QMgrSummary/Queue Manager file system - free space": metricLookup{"queue_manager_file_system_free_space_percentage", true},
|
||||||
"DISK/Log/Log - bytes in use": "log_in_use_bytes",
|
"DISK/QMgrSummary/Queue Manager file system - bytes in use": metricLookup{"queue_manager_file_system_in_use_bytes", true},
|
||||||
"DISK/Log/Log - logical bytes written": "log_logical_written_bytes",
|
"DISK/Log/Log - logical bytes written": metricLookup{"log_logical_written_bytes_interval_total", true},
|
||||||
"DISK/Log/Log - write latency": "log_write_latency_seconds",
|
"DISK/Log/Log - physical bytes written": metricLookup{"log_physical_written_bytes_interval_total", true},
|
||||||
"DISK/Log/Log - bytes required for media recovery": "log_required_for_media_recovery_bytes",
|
"DISK/Log/Log - current primary space in use": metricLookup{"log_primary_space_in_use_percentage", true},
|
||||||
"DISK/Log/Log - current primary space in use": "log_current_primary_space_in_use_percentage",
|
"DISK/Log/Log - workload primary space utilization": metricLookup{"log_workload_primary_space_utilization_percentage", true},
|
||||||
"DISK/Log/Log - workload primary space utilization": "log_workload_primary_space_utilization_percentage",
|
"DISK/Log/Log - write latency": metricLookup{"log_write_latency_seconds", true},
|
||||||
"DISK/Log/Log - bytes occupied by extents waiting to be archived": "log_occupied_by_extents_waiting_to_be_archived_bytes",
|
"DISK/Log/Log - bytes max": metricLookup{"log_max_bytes", true},
|
||||||
"DISK/Log/Log - bytes max": "log_max_bytes",
|
"DISK/Log/Log - write size": metricLookup{"log_write_size_bytes", true},
|
||||||
"DISK/Log/Log file system - bytes in use": "log_file_system_in_use_bytes",
|
"DISK/Log/Log - bytes in use": metricLookup{"log_in_use_bytes", true},
|
||||||
"DISK/Log/Log file system - bytes max": "log_file_system_max_bytes",
|
"DISK/Log/Log file system - bytes max": metricLookup{"log_file_system_max_bytes", true},
|
||||||
"DISK/Log/Log - physical bytes written": "log_physical_written_bytes",
|
"DISK/Log/Log file system - bytes in use": metricLookup{"log_file_system_in_use_bytes", true},
|
||||||
"STATMQI/SUBSCRIBE/Create durable subscription count": "create_durable_subscription_count",
|
"DISK/Log/Log - bytes occupied by reusable extents": metricLookup{"log_occupied_by_reusable_extents_bytes", true},
|
||||||
"STATMQI/SUBSCRIBE/Resume durable subscription count": "resume_durable_subscription_count",
|
"DISK/Log/Log - bytes occupied by extents waiting to be archived": metricLookup{"log_occupied_by_extents_waiting_to_be_archived_bytes", true},
|
||||||
"STATMQI/SUBSCRIBE/Create non-durable subscription count": "create_non_durable_subscription_count",
|
"DISK/Log/Log - bytes required for media recovery": metricLookup{"log_required_for_media_recovery_bytes", true},
|
||||||
"STATMQI/SUBSCRIBE/Failed create/alter/resume subscription count": "failed_create_alter_resume_subscription_count",
|
"STATMQI/SUBSCRIBE/Create durable subscription count": metricLookup{"durable_subscription_create_interval_total", true},
|
||||||
"STATMQI/SUBSCRIBE/Subscription delete failure count": "subscription_delete_failure_count",
|
"STATMQI/SUBSCRIBE/Alter durable subscription count": metricLookup{"durable_subscription_alter_interval_total", true},
|
||||||
"STATMQI/SUBSCRIBE/MQSUBRQ count": "mqsubrq_count",
|
"STATMQI/SUBSCRIBE/Resume durable subscription count": metricLookup{"durable_subscription_resume_interval_total", true},
|
||||||
"STATMQI/SUBSCRIBE/Failed MQSUBRQ count": "failed_mqsubrq_count",
|
"STATMQI/SUBSCRIBE/Delete durable subscription count": metricLookup{"durable_subscription_delete_interval_total", true},
|
||||||
"STATMQI/SUBSCRIBE/Durable subscriber - high water mark": "durable_subscriber_high_water_mark_count",
|
"STATMQI/SUBSCRIBE/Create non-durable subscription count": metricLookup{"non_durable_subscription_create_interval_total", true},
|
||||||
"STATMQI/SUBSCRIBE/Non-durable subscriber - high water mark": "non_durable_subscriber_high_water_mark_count",
|
"STATMQI/SUBSCRIBE/Delete non-durable subscription count": metricLookup{"non_durable_subscription_delete_interval_total", true},
|
||||||
"STATMQI/SUBSCRIBE/Durable subscriber - low water mark": "durable_subscriber_low_water_mark_count",
|
"STATMQI/SUBSCRIBE/Failed create/alter/resume subscription count": metricLookup{"failed_subscription_create_alter_resume_interval_total", true},
|
||||||
"STATMQI/SUBSCRIBE/Delete non-durable subscription count": "delete_non_durable_subscription_count",
|
"STATMQI/SUBSCRIBE/Subscription delete failure count": metricLookup{"failed_subscription_delete_interval_total", true},
|
||||||
"STATMQI/SUBSCRIBE/Alter durable subscription count": "alter_durable_subscription_count",
|
"STATMQI/SUBSCRIBE/MQSUBRQ count": metricLookup{"mqsubrq_interval_total", true},
|
||||||
"STATMQI/SUBSCRIBE/Delete durable subscription count": "delete_durable_subscription_count",
|
"STATMQI/SUBSCRIBE/Failed MQSUBRQ count": metricLookup{"failed_mqsubrq_interval_total", true},
|
||||||
"STATMQI/SUBSCRIBE/Non-durable subscriber - low water mark": "non_durable_subscriber_low_water_mark_count",
|
"STATMQI/SUBSCRIBE/Durable subscriber - high water mark": metricLookup{"durable_subscriber_high_water_mark", true},
|
||||||
"STATMQI/PUBLISH/Interval total topic bytes put": "interval_total_topic_put_bytes",
|
"STATMQI/SUBSCRIBE/Durable subscriber - low water mark": metricLookup{"durable_subscriber_low_water_mark", true},
|
||||||
"STATMQI/PUBLISH/Published to subscribers - message count": "published_to_subscribers_message_count",
|
"STATMQI/SUBSCRIBE/Non-durable subscriber - high water mark": metricLookup{"non_durable_subscriber_high_water_mark", true},
|
||||||
"STATMQI/PUBLISH/Published to subscribers - byte count": "published_to_subscribers_bytes",
|
"STATMQI/SUBSCRIBE/Non-durable subscriber - low water mark": metricLookup{"non_durable_subscriber_low_water_mark", true},
|
||||||
"STATMQI/PUBLISH/Non-persistent - topic MQPUT/MQPUT1 count": "non_persistent_topic_mqput_mqput1_count",
|
"STATMQI/PUBLISH/Topic MQPUT/MQPUT1 interval total": metricLookup{"topic_mqput_mqput1_interval_total", true},
|
||||||
"STATMQI/PUBLISH/Persistent - topic MQPUT/MQPUT1 count": "persistent_topic_mqput_mqput1_count",
|
"STATMQI/PUBLISH/Interval total topic bytes put": metricLookup{"topic_put_bytes_interval_total", true},
|
||||||
"STATMQI/PUBLISH/Failed topic MQPUT/MQPUT1 count": "failed_topic_mqput_mqput1_count",
|
"STATMQI/PUBLISH/Failed topic MQPUT/MQPUT1 count": metricLookup{"failed_topic_mqput_mqput1_interval_total", true},
|
||||||
"STATMQI/PUBLISH/Topic MQPUT/MQPUT1 interval total": "topic_mqput_mqput1_interval_count",
|
"STATMQI/PUBLISH/Persistent - topic MQPUT/MQPUT1 count": metricLookup{"persistent_topic_mqput_mqput1_interval_total", true},
|
||||||
"STATMQI/CONNDISC/MQCONN/MQCONNX count": "mqconn_mqconnx_count",
|
"STATMQI/PUBLISH/Non-persistent - topic MQPUT/MQPUT1 count": metricLookup{"non_persistent_topic_mqput_mqput1_interval_total", true},
|
||||||
"STATMQI/CONNDISC/Failed MQCONN/MQCONNX count": "failed_mqconn_mqconnx_count",
|
"STATMQI/PUBLISH/Published to subscribers - message count": metricLookup{"published_to_subscribers_message_interval_total", true},
|
||||||
"STATMQI/CONNDISC/Concurrent connections - high water mark": "concurrent_connections_high_water_mark_count",
|
"STATMQI/PUBLISH/Published to subscribers - byte count": metricLookup{"published_to_subscribers_bytes_interval_total", true},
|
||||||
"STATMQI/CONNDISC/MQDISC count": "mqdisc_count",
|
"STATMQI/CONNDISC/MQCONN/MQCONNX count": metricLookup{"mqconn_mqconnx_interval_total", true},
|
||||||
"STATMQI/OPENCLOSE/MQOPEN count": "mqopen_count",
|
"STATMQI/CONNDISC/Failed MQCONN/MQCONNX count": metricLookup{"failed_mqconn_mqconnx_interval_total", true},
|
||||||
"STATMQI/OPENCLOSE/Failed MQOPEN count": "failed_mqopen_count",
|
"STATMQI/CONNDISC/MQDISC count": metricLookup{"mqdisc_interval_total", true},
|
||||||
"STATMQI/OPENCLOSE/MQCLOSE count": "mqclose_count",
|
"STATMQI/CONNDISC/Concurrent connections - high water mark": metricLookup{"concurrent_connections_high_water_mark", true},
|
||||||
"STATMQI/OPENCLOSE/Failed MQCLOSE count": "failed_mqclose_count",
|
"STATMQI/OPENCLOSE/MQOPEN count": metricLookup{"mqopen_interval_total", true},
|
||||||
"STATMQI/INQSET/MQINQ count": "mqinq_count",
|
"STATMQI/OPENCLOSE/Failed MQOPEN count": metricLookup{"failed_mqopen_interval_total", true},
|
||||||
"STATMQI/INQSET/Failed MQINQ count": "failed_mqinq_count",
|
"STATMQI/OPENCLOSE/MQCLOSE count": metricLookup{"mqclose_interval_total", true},
|
||||||
"STATMQI/INQSET/MQSET count": "mqset_count",
|
"STATMQI/OPENCLOSE/Failed MQCLOSE count": metricLookup{"failed_mqclose_interval_total", true},
|
||||||
"STATMQI/INQSET/Failed MQSET count": "failed_mqset_count",
|
"STATMQI/INQSET/MQINQ count": metricLookup{"mqinq_interval_total", true},
|
||||||
"STATMQI/PUT/Interval total MQPUT/MQPUT1 byte count": "interval_total_mqput_mqput1_bytes",
|
"STATMQI/INQSET/Failed MQINQ count": metricLookup{"failed_mqinq_interval_total", true},
|
||||||
"STATMQI/PUT/Persistent message MQPUT count": "persistent_message_mqput_count",
|
"STATMQI/INQSET/MQSET count": metricLookup{"mqset_interval_total", true},
|
||||||
"STATMQI/PUT/Failed MQPUT count": "failed_mqput_count",
|
"STATMQI/INQSET/Failed MQSET count": metricLookup{"failed_mqset_interval_total", true},
|
||||||
"STATMQI/PUT/Non-persistent message MQPUT1 count": "non_persistent_message_mqput1_count",
|
"STATMQI/PUT/Persistent message MQPUT count": metricLookup{"persistent_message_mqput_interval_total", true},
|
||||||
"STATMQI/PUT/Persistent message MQPUT1 count": "persistent_message_mqput1_count",
|
"STATMQI/PUT/Persistent message MQPUT1 count": metricLookup{"persistent_message_mqput1_interval_total", true},
|
||||||
"STATMQI/PUT/Failed MQPUT1 count": "failed_mqput1_count",
|
"STATMQI/PUT/Put persistent messages - byte count": metricLookup{"persistent_message_put_bytes_interval_total", true},
|
||||||
"STATMQI/PUT/Put non-persistent messages - byte count": "put_non_persistent_messages_bytes",
|
"STATMQI/PUT/Non-persistent message MQPUT count": metricLookup{"non_persistent_message_mqput_interval_total", true},
|
||||||
"STATMQI/PUT/Interval total MQPUT/MQPUT1 count": "interval_total_mqput_mqput1_count",
|
"STATMQI/PUT/Non-persistent message MQPUT1 count": metricLookup{"non_persistent_message_mqput1_interval_total", true},
|
||||||
"STATMQI/PUT/Put persistent messages - byte count": "put_persistent_messages_bytes",
|
"STATMQI/PUT/Put non-persistent messages - byte count": metricLookup{"non_persistent_message_put_bytes_interval_total", true},
|
||||||
"STATMQI/PUT/MQSTAT count": "mqstat_count",
|
"STATMQI/PUT/Interval total MQPUT/MQPUT1 count": metricLookup{"mqput_mqput1_interval_total", true},
|
||||||
"STATMQI/PUT/Non-persistent message MQPUT count": "non_persistent_message_mqput_count",
|
"STATMQI/PUT/Interval total MQPUT/MQPUT1 byte count": metricLookup{"mqput_mqput1_bytes_interval_total", true},
|
||||||
"STATMQI/GET/Interval total destructive get- count": "interval_total_destructive_get_count",
|
"STATMQI/PUT/Failed MQPUT count": metricLookup{"failed_mqput_interval_total", true},
|
||||||
"STATMQI/GET/MQCTL count": "mqctl_count",
|
"STATMQI/PUT/Failed MQPUT1 count": metricLookup{"failed_mqput1_interval_total", true},
|
||||||
"STATMQI/GET/Failed MQGET - count": "failed_mqget_count",
|
"STATMQI/PUT/MQSTAT count": metricLookup{"mqstat_interval_total", true},
|
||||||
"STATMQI/GET/Got non-persistent messages - byte count": "got_non_persistent_messages_bytes",
|
"STATMQI/GET/Persistent message destructive get - count": metricLookup{"persistent_message_destructive_get_interval_total", true},
|
||||||
"STATMQI/GET/Persistent message browse - count": "persistent_message_browse_count",
|
"STATMQI/GET/Persistent message browse - count": metricLookup{"persistent_message_browse_interval_total", true},
|
||||||
"STATMQI/GET/Expired message count": "expired_message_count",
|
"STATMQI/GET/Got persistent messages - byte count": metricLookup{"persistent_message_get_bytes_interval_total", true},
|
||||||
"STATMQI/GET/Purged queue count": "purged_queue_count",
|
"STATMQI/GET/Persistent message browse - byte count": metricLookup{"persistent_message_browse_bytes_interval_total", true},
|
||||||
"STATMQI/GET/Interval total destructive get - byte count": "interval_total_destructive_get_bytes",
|
"STATMQI/GET/Non-persistent message destructive get - count": metricLookup{"non_persistent_message_destructive_get_interval_total", true},
|
||||||
"STATMQI/GET/Non-persistent message destructive get - count": "non_persistent_message_destructive_get_count",
|
"STATMQI/GET/Non-persistent message browse - count": metricLookup{"non_persistent_message_browse_interval_total", true},
|
||||||
"STATMQI/GET/Got persistent messages - byte count": "got_persistent_messages_bytes",
|
"STATMQI/GET/Got non-persistent messages - byte count": metricLookup{"non_persistent_message_get_bytes_interval_total", true},
|
||||||
"STATMQI/GET/Non-persistent message browse - count": "non_persistent_message_browse_count",
|
"STATMQI/GET/Non-persistent message browse - byte count": metricLookup{"non_persistent_message_browse_bytes_interval_total", true},
|
||||||
"STATMQI/GET/Failed browse count": "failed_browse_count",
|
"STATMQI/GET/Interval total destructive get- count": metricLookup{"destructive_get_interval_total", true},
|
||||||
"STATMQI/GET/Persistent message destructive get - count": "persistent_message_destructive_get_count",
|
"STATMQI/GET/Interval total destructive get - byte count": metricLookup{"destructive_get_bytes_interval_total", true},
|
||||||
"STATMQI/GET/Non-persistent message browse - byte count": "non_persistent_message_browse_bytes",
|
"STATMQI/GET/Failed MQGET - count": metricLookup{"failed_mqget_interval_total", true},
|
||||||
"STATMQI/GET/Persistent message browse - byte count": "persistent_message_browse_bytes",
|
"STATMQI/GET/Failed browse count": metricLookup{"failed_browse_interval_total", true},
|
||||||
"STATMQI/GET/MQCB count": "mqcb_count",
|
"STATMQI/GET/MQCTL count": metricLookup{"mqctl_interval_total", true},
|
||||||
"STATMQI/GET/Failed MQCB count": "failed_mqcb_count",
|
"STATMQI/GET/Expired message count": metricLookup{"expired_message_interval_total", true},
|
||||||
"STATMQI/SYNCPOINT/Commit count": "commit_count",
|
"STATMQI/GET/Purged queue count": metricLookup{"purged_queue_interval_total", true},
|
||||||
"STATMQI/SYNCPOINT/Rollback count": "rollback_count",
|
"STATMQI/GET/MQCB count": metricLookup{"mqcb_interval_total", true},
|
||||||
|
"STATMQI/GET/Failed MQCB count": metricLookup{"failed_mqcb_interval_total", true},
|
||||||
|
"STATMQI/SYNCPOINT/Commit count": metricLookup{"commit_interval_total", true},
|
||||||
|
"STATMQI/SYNCPOINT/Rollback count": metricLookup{"rollback_interval_total", true},
|
||||||
}
|
}
|
||||||
return metricNamesMap
|
return metricNamesMap
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,8 +30,8 @@ func TestGenerateMetricNamesMap(t *testing.T) {
|
|||||||
if !ok {
|
if !ok {
|
||||||
t.Errorf("No metric name mapping found for %s", testKey1)
|
t.Errorf("No metric name mapping found for %s", testKey1)
|
||||||
} else {
|
} else {
|
||||||
if actual != testElement1Name {
|
if actual.name != testElement1Name {
|
||||||
t.Errorf("Expected metric name=%s; actual %s", testElement1Name, actual)
|
t.Errorf("Expected metric name=%s; actual %s", testElement1Name, actual.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,23 +143,29 @@ func initialiseMetrics(log *logger.Logger) (map[string]*metricData, error) {
|
|||||||
key := makeKey(metricElement)
|
key := makeKey(metricElement)
|
||||||
|
|
||||||
// Get metric name from mapping
|
// Get metric name from mapping
|
||||||
if metricName, found := metricNamesMap[key]; found {
|
if metricLookup, found := metricNamesMap[key]; found {
|
||||||
|
|
||||||
// Set metric details
|
// Check if metric is enabled
|
||||||
metric := metricData{
|
if metricLookup.enabled {
|
||||||
name: metricName,
|
|
||||||
description: metricElement.Description,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add metric
|
// Set metric details
|
||||||
if _, exists := metrics[key]; !exists {
|
metric := metricData{
|
||||||
metrics[key] = &metric
|
name: metricLookup.name,
|
||||||
|
description: metricElement.Description,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add metric
|
||||||
|
if _, exists := metrics[key]; !exists {
|
||||||
|
metrics[key] = &metric
|
||||||
|
} else {
|
||||||
|
log.Errorf("Metrics Error: Found duplicate metric key [%s]", key)
|
||||||
|
validMetrics = false
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
log.Errorf("Metrics Error: Found duplicate metric key %s", key)
|
log.Debugf("Metrics: Skipping metric, metric is not enabled for key [%s]", key)
|
||||||
validMetrics = false
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log.Errorf("Metrics Error: Skipping metric, unexpected key %s", key)
|
log.Errorf("Metrics Error: Skipping metric, unexpected key [%s]", key)
|
||||||
validMetrics = false
|
validMetrics = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -164,96 +164,96 @@ func metricNames() []string {
|
|||||||
// - log_required_for_media_recovery_bytes
|
// - log_required_for_media_recovery_bytes
|
||||||
|
|
||||||
names := []string{
|
names := []string{
|
||||||
|
"cpu_load_one_minute_average_percentage",
|
||||||
"cpu_load_five_minute_average_percentage",
|
"cpu_load_five_minute_average_percentage",
|
||||||
"cpu_load_fifteen_minute_average_percentage",
|
"cpu_load_fifteen_minute_average_percentage",
|
||||||
"ram_free_percentage",
|
|
||||||
"ram_total_bytes",
|
|
||||||
"user_cpu_time_percentage",
|
|
||||||
"system_cpu_time_percentage",
|
"system_cpu_time_percentage",
|
||||||
"cpu_load_one_minute_average_percentage",
|
"user_cpu_time_percentage",
|
||||||
|
"ram_free_percentage",
|
||||||
|
"system_ram_size_bytes",
|
||||||
"system_cpu_time_estimate_for_queue_manager_percentage",
|
"system_cpu_time_estimate_for_queue_manager_percentage",
|
||||||
"ram_total_estimate_for_queue_manager_bytes",
|
|
||||||
"user_cpu_time_estimate_for_queue_manager_percentage",
|
"user_cpu_time_estimate_for_queue_manager_percentage",
|
||||||
"mq_trace_file_system_in_use_bytes",
|
"ram_usage_estimate_for_queue_manager_bytes",
|
||||||
"mq_trace_file_system_free_space_percentage",
|
"trace_file_system_free_space_percentage",
|
||||||
"mq_errors_file_system_in_use_bytes",
|
"trace_file_system_in_use_bytes",
|
||||||
"mq_errors_file_system_free_space_percentage",
|
"errors_file_system_free_space_percentage",
|
||||||
"mq_fdc_file_count",
|
"errors_file_system_in_use_bytes",
|
||||||
"queue_manager_file_system_in_use_bytes",
|
"fdc_files",
|
||||||
"queue_manager_file_system_free_space_percentage",
|
"queue_manager_file_system_free_space_percentage",
|
||||||
|
"queue_manager_file_system_in_use_bytes",
|
||||||
|
"log_logical_written_bytes_interval_total",
|
||||||
|
"log_physical_written_bytes_interval_total",
|
||||||
|
"log_primary_space_in_use_percentage",
|
||||||
|
"log_workload_primary_space_utilization_percentage",
|
||||||
|
"log_write_latency_seconds",
|
||||||
|
"log_max_bytes",
|
||||||
"log_write_size_bytes",
|
"log_write_size_bytes",
|
||||||
"log_in_use_bytes",
|
"log_in_use_bytes",
|
||||||
"log_logical_written_bytes",
|
|
||||||
"log_write_latency_seconds",
|
|
||||||
"log_current_primary_space_in_use_percentage",
|
|
||||||
"log_workload_primary_space_utilization_percentage",
|
|
||||||
"log_max_bytes",
|
|
||||||
"log_file_system_in_use_bytes",
|
|
||||||
"log_file_system_max_bytes",
|
"log_file_system_max_bytes",
|
||||||
"log_physical_written_bytes",
|
"log_file_system_in_use_bytes",
|
||||||
"create_durable_subscription_count",
|
"durable_subscription_create_interval_total",
|
||||||
"resume_durable_subscription_count",
|
"durable_subscription_alter_interval_total",
|
||||||
"create_non_durable_subscription_count",
|
"durable_subscription_resume_interval_total",
|
||||||
"failed_create_alter_resume_subscription_count",
|
"durable_subscription_delete_interval_total",
|
||||||
"subscription_delete_failure_count",
|
"non_durable_subscription_create_interval_total",
|
||||||
"mqsubrq_count",
|
"non_durable_subscription_delete_interval_total",
|
||||||
"failed_mqsubrq_count",
|
"failed_subscription_create_alter_resume_interval_total",
|
||||||
"durable_subscriber_high_water_mark_count",
|
"failed_subscription_delete_interval_total",
|
||||||
"non_durable_subscriber_high_water_mark_count",
|
"mqsubrq_interval_total",
|
||||||
"durable_subscriber_low_water_mark_count",
|
"failed_mqsubrq_interval_total",
|
||||||
"delete_non_durable_subscription_count",
|
"durable_subscriber_high_water_mark",
|
||||||
"alter_durable_subscription_count",
|
"durable_subscriber_low_water_mark",
|
||||||
"delete_durable_subscription_count",
|
"non_durable_subscriber_high_water_mark",
|
||||||
"non_durable_subscriber_low_water_mark_count",
|
"non_durable_subscriber_low_water_mark",
|
||||||
"interval_total_topic_put_bytes",
|
"topic_mqput_mqput1_interval_total",
|
||||||
"published_to_subscribers_message_count",
|
"topic_put_bytes_interval_total",
|
||||||
"published_to_subscribers_bytes",
|
"failed_topic_mqput_mqput1_interval_total",
|
||||||
"non_persistent_topic_mqput_mqput1_count",
|
"persistent_topic_mqput_mqput1_interval_total",
|
||||||
"persistent_topic_mqput_mqput1_count",
|
"non_persistent_topic_mqput_mqput1_interval_total",
|
||||||
"failed_topic_mqput_mqput1_count",
|
"published_to_subscribers_message_interval_total",
|
||||||
"topic_mqput_mqput1_interval_count",
|
"published_to_subscribers_bytes_interval_total",
|
||||||
"mqconn_mqconnx_count",
|
"mqconn_mqconnx_interval_total",
|
||||||
"failed_mqconn_mqconnx_count",
|
"failed_mqconn_mqconnx_interval_total",
|
||||||
"concurrent_connections_high_water_mark_count",
|
"mqdisc_interval_total",
|
||||||
"mqdisc_count",
|
"concurrent_connections_high_water_mark",
|
||||||
"mqopen_count",
|
"mqopen_interval_total",
|
||||||
"failed_mqopen_count",
|
"failed_mqopen_interval_total",
|
||||||
"mqclose_count",
|
"mqclose_interval_total",
|
||||||
"failed_mqclose_count",
|
"failed_mqclose_interval_total",
|
||||||
"mqinq_count",
|
"mqinq_interval_total",
|
||||||
"failed_mqinq_count",
|
"failed_mqinq_interval_total",
|
||||||
"mqset_count",
|
"mqset_interval_total",
|
||||||
"failed_mqset_count",
|
"failed_mqset_interval_total",
|
||||||
"interval_total_mqput_mqput1_bytes",
|
"persistent_message_mqput_interval_total",
|
||||||
"persistent_message_mqput_count",
|
"persistent_message_mqput1_interval_total",
|
||||||
"failed_mqput_count",
|
"persistent_message_put_bytes_interval_total",
|
||||||
"non_persistent_message_mqput1_count",
|
"non_persistent_message_mqput_interval_total",
|
||||||
"persistent_message_mqput1_count",
|
"non_persistent_message_mqput1_interval_total",
|
||||||
"failed_mqput1_count",
|
"non_persistent_message_put_bytes_interval_total",
|
||||||
"put_non_persistent_messages_bytes",
|
"mqput_mqput1_interval_total",
|
||||||
"interval_total_mqput_mqput1_count",
|
"mqput_mqput1_bytes_interval_total",
|
||||||
"put_persistent_messages_bytes",
|
"failed_mqput_interval_total",
|
||||||
"mqstat_count",
|
"failed_mqput1_interval_total",
|
||||||
"non_persistent_message_mqput_count",
|
"mqstat_interval_total",
|
||||||
"interval_total_destructive_get_count",
|
"persistent_message_destructive_get_interval_total",
|
||||||
"mqctl_count",
|
"persistent_message_browse_interval_total",
|
||||||
"failed_mqget_count",
|
"persistent_message_get_bytes_interval_total",
|
||||||
"got_non_persistent_messages_bytes",
|
"persistent_message_browse_bytes_interval_total",
|
||||||
"persistent_message_browse_count",
|
"non_persistent_message_destructive_get_interval_total",
|
||||||
"expired_message_count",
|
"non_persistent_message_browse_interval_total",
|
||||||
"purged_queue_count",
|
"non_persistent_message_get_bytes_interval_total",
|
||||||
"interval_total_destructive_get_bytes",
|
"non_persistent_message_browse_bytes_interval_total",
|
||||||
"non_persistent_message_destructive_get_count",
|
"destructive_get_interval_total",
|
||||||
"got_persistent_messages_bytes",
|
"destructive_get_bytes_interval_total",
|
||||||
"non_persistent_message_browse_count",
|
"failed_mqget_interval_total",
|
||||||
"failed_browse_count",
|
"failed_browse_interval_total",
|
||||||
"persistent_message_destructive_get_count",
|
"mqctl_interval_total",
|
||||||
"non_persistent_message_browse_bytes",
|
"expired_message_interval_total",
|
||||||
"persistent_message_browse_bytes",
|
"purged_queue_interval_total",
|
||||||
"mqcb_count",
|
"mqcb_interval_total",
|
||||||
"failed_mqcb_count",
|
"failed_mqcb_interval_total",
|
||||||
"commit_count",
|
"commit_interval_total",
|
||||||
"rollback_count",
|
"rollback_interval_total",
|
||||||
}
|
}
|
||||||
return names
|
return names
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user