Skip to content

N
nexpie-grafana-theme
Commit 314bff1b by bergquist Committed by Carl Bergquist
Options

adds grafana_ prefix for none standard metrics

parent 9c30bf53
Showing with 112 additions and 67 deletions
pkg/api/route_register_test.go
...@@ -55,7 +55,7 @@ func TestRouteSimpleRegister(t *testing.T) { ...@@ -55,7 +55,7 @@ func TestRouteSimpleRegister(t *testing.T) {
t.Errorf("want %v routes, got %v", len(testTable), len(fr.route)) t.Errorf("want %v routes, got %v", len(testTable), len(fr.route))
} }
for i, _ := range testTable { for i := range testTable {
if testTable[i].method != fr.route[i].method { if testTable[i].method != fr.route[i].method {
t.Errorf("want %s got %v", testTable[i].method, fr.route[i].method) t.Errorf("want %s got %v", testTable[i].method, fr.route[i].method)
} }
...@@ -109,7 +109,7 @@ func TestRouteGroupedRegister(t *testing.T) { ...@@ -109,7 +109,7 @@ func TestRouteGroupedRegister(t *testing.T) {
t.Errorf("want %v routes, got %v", len(testTable), len(fr.route)) t.Errorf("want %v routes, got %v", len(testTable), len(fr.route))
} }
for i, _ := range testTable { for i := range testTable {
if testTable[i].method != fr.route[i].method { if testTable[i].method != fr.route[i].method {
t.Errorf("want %s got %v", testTable[i].method, fr.route[i].method) t.Errorf("want %s got %v", testTable[i].method, fr.route[i].method)
} }
...@@ -165,7 +165,7 @@ func TestNamedMiddlewareRouteRegister(t *testing.T) { ...@@ -165,7 +165,7 @@ func TestNamedMiddlewareRouteRegister(t *testing.T) {
t.Errorf("want %v routes, got %v", len(testTable), len(fr.route)) t.Errorf("want %v routes, got %v", len(testTable), len(fr.route))
} }
for i, _ := range testTable { for i := range testTable {
if testTable[i].method != fr.route[i].method { if testTable[i].method != fr.route[i].method {
t.Errorf("want %s got %v", testTable[i].method, fr.route[i].method) t.Errorf("want %s got %v", testTable[i].method, fr.route[i].method)
} }
......
pkg/metrics/graphitebridge/graphite.go
...@@ -54,6 +54,7 @@ const ( ...@@ -54,6 +54,7 @@ const (
) )
var metricCategoryPrefix []string = []string{"proxy_", "api_", "page_", "alerting_", "aws_", "db_", "stat_", "go_", "process_"} var metricCategoryPrefix []string = []string{"proxy_", "api_", "page_", "alerting_", "aws_", "db_", "stat_", "go_", "process_"}
var trimMetricPrefix []string = []string{"grafana_"}
// Config defines the Graphite bridge config. // Config defines the Graphite bridge config.
type Config struct { type Config struct {
...@@ -237,7 +238,13 @@ func writeMetric(buf *bufio.Writer, m model.Metric, mf *dto.MetricFamily) error ...@@ -237,7 +238,13 @@ func writeMetric(buf *bufio.Writer, m model.Metric, mf *dto.MetricFamily) error
for _, v := range metricCategoryPrefix { for _, v := range metricCategoryPrefix {
if strings.HasPrefix(string(metricName), v) { if strings.HasPrefix(string(metricName), v) {
group := strings.Replace(v, "_", " ", 1) group := strings.Replace(v, "_", " ", 1)
metricName = model.LabelValue(strings.Replace(string(metricName), v, group, -1)) metricName = model.LabelValue(strings.Replace(string(metricName), v, group, 1))
}
}
for _, v := range trimMetricPrefix {
if strings.HasPrefix(string(metricName), v) {
metricName = model.LabelValue(strings.Replace(string(metricName), v, "", 1))
} }
} }
......
pkg/metrics/graphitebridge/graphite_test.go
...@@ -370,10 +370,10 @@ func TestCounter(t *testing.T) { ...@@ -370,10 +370,10 @@ func TestCounter(t *testing.T) {
} }
} }
func TestCanIgnoreSomeMetrics(t *testing.T) { func TestTrimGrafanaNamespace(t *testing.T) {
cntVec := prometheus.NewCounter( cntVec := prometheus.NewCounter(
prometheus.CounterOpts{ prometheus.CounterOpts{
Name: "http_request_total", Name: "grafana_http_request_total",
Help: "docstring", Help: "docstring",
ConstLabels: prometheus.Labels{"constname": "constvalue"}, ConstLabels: prometheus.Labels{"constname": "constvalue"},
}) })
...@@ -404,7 +404,7 @@ func TestCanIgnoreSomeMetrics(t *testing.T) { ...@@ -404,7 +404,7 @@ func TestCanIgnoreSomeMetrics(t *testing.T) {
t.Fatalf("error: %v", err) t.Fatalf("error: %v", err)
} }
want := "" want := "prefix.http_request_total.constname.constvalue.count 1 1477043\n"
if got := buf.String(); want != got { if got := buf.String(); want != got {
t.Fatalf("wanted \n%s\n, got \n%s\n", want, got) t.Fatalf("wanted \n%s\n, got \n%s\n", want, got)
} }
......
pkg/metrics/metrics.go
...@@ -15,6 +15,8 @@ import ( ...@@ -15,6 +15,8 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
) )
const exporterName = "grafana"
var ( var (
M_Instance_Start prometheus.Counter M_Instance_Start prometheus.Counter
M_Page_Status *prometheus.CounterVec M_Page_Status *prometheus.CounterVec
...@@ -58,30 +60,34 @@ var ( ...@@ -58,30 +60,34 @@ var (
func init() { func init() {
M_Instance_Start = prometheus.NewCounter(prometheus.CounterOpts{ M_Instance_Start = prometheus.NewCounter(prometheus.CounterOpts{
Name: "instance_start_total", Name: "instance_start_total",
Help: "counter for started instances", Help: "counter for started instances",
Namespace: exporterName,
}) })
M_Page_Status = prometheus.NewCounterVec( M_Page_Status = prometheus.NewCounterVec(
prometheus.CounterOpts{ prometheus.CounterOpts{
Name: "page_response_status_total", Name: "page_response_status_total",
Help: "page http response status", Help: "page http response status",
Namespace: exporterName,
}, },
[]string{"code"}, []string{"code"},
) )
M_Api_Status = prometheus.NewCounterVec( M_Api_Status = prometheus.NewCounterVec(
prometheus.CounterOpts{ prometheus.CounterOpts{
Name: "api_response_status_total", Name: "api_response_status_total",
Help: "api http response status", Help: "api http response status",
Namespace: exporterName,
}, },
[]string{"code"}, []string{"code"},
) )
M_Proxy_Status = prometheus.NewCounterVec( M_Proxy_Status = prometheus.NewCounterVec(
prometheus.CounterOpts{ prometheus.CounterOpts{
Name: "proxy_response_status_total", Name: "proxy_response_status_total",
Help: "proxy http response status", Help: "proxy http response status",
Namespace: exporterName,
}, },
[]string{"code"}, []string{"code"},
) )
...@@ -103,127 +109,159 @@ func init() { ...@@ -103,127 +109,159 @@ func init() {
) )
M_Api_User_SignUpStarted = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_User_SignUpStarted = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_user_signup_started_total", Name: "api_user_signup_started_total",
Help: "amount of users who started the signup flow", Help: "amount of users who started the signup flow",
Namespace: exporterName,
}) })
M_Api_User_SignUpCompleted = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_User_SignUpCompleted = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_user_signup_completed_total", Name: "api_user_signup_completed_total",
Help: "amount of users who completed the signup flow", Help: "amount of users who completed the signup flow",
Namespace: exporterName,
}) })
M_Api_User_SignUpInvite = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_User_SignUpInvite = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_user_signup_invite_total", Name: "api_user_signup_invite_total",
Help: "amount of users who have been invited", Help: "amount of users who have been invited",
Namespace: exporterName,
}) })
M_Api_Dashboard_Save = prometheus.NewSummary(prometheus.SummaryOpts{ M_Api_Dashboard_Save = prometheus.NewSummary(prometheus.SummaryOpts{
Name: "api_dashboard_save", Name: "api_dashboard_save",
Help: "summary for dashboard save duration", Help: "summary for dashboard save duration",
Namespace: exporterName,
}) })
M_Api_Dashboard_Get = prometheus.NewSummary(prometheus.SummaryOpts{ M_Api_Dashboard_Get = prometheus.NewSummary(prometheus.SummaryOpts{
Name: "api_dashboard_get", Name: "api_dashboard_get",
Help: "summary for dashboard get duration", Help: "summary for dashboard get duration",
Namespace: exporterName,
}) })
M_Api_Dashboard_Search = prometheus.NewSummary(prometheus.SummaryOpts{ M_Api_Dashboard_Search = prometheus.NewSummary(prometheus.SummaryOpts{
Name: "api_dashboard_search", Name: "api_dashboard_search",
Help: "summary for dashboard search duration", Help: "summary for dashboard search duration",
Namespace: exporterName,
}) })
M_Api_Admin_User_Create = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_Admin_User_Create = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_admin_user_created_total", Name: "api_admin_user_created_total",
Help: "api admin user created counter", Help: "api admin user created counter",
Namespace: exporterName,
}) })
M_Api_Login_Post = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_Login_Post = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_login_post_total", Name: "api_login_post_total",
Help: "api login post counter", Help: "api login post counter",
Namespace: exporterName,
}) })
M_Api_Login_OAuth = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_Login_OAuth = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_login_oauth_total", Name: "api_login_oauth_total",
Help: "api login oauth counter", Help: "api login oauth counter",
Namespace: exporterName,
}) })
M_Api_Org_Create = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_Org_Create = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_org_create_total", Name: "api_org_create_total",
Help: "api org created counter", Help: "api org created counter",
Namespace: exporterName,
}) })
M_Api_Dashboard_Snapshot_Create = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_Dashboard_Snapshot_Create = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_dashboard_snapshot_create_total", Name: "api_dashboard_snapshot_create_total",
Help: "dashboard snapshots created", Help: "dashboard snapshots created",
Namespace: exporterName,
}) })
M_Api_Dashboard_Snapshot_External = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_Dashboard_Snapshot_External = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_dashboard_snapshot_external_total", Name: "api_dashboard_snapshot_external_total",
Help: "external dashboard snapshots created", Help: "external dashboard snapshots created",
Namespace: exporterName,
}) })
M_Api_Dashboard_Snapshot_Get = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_Dashboard_Snapshot_Get = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_dashboard_snapshot_get_total", Name: "api_dashboard_snapshot_get_total",
Help: "loaded dashboards", Help: "loaded dashboards",
Namespace: exporterName,
}) })
M_Api_Dashboard_Insert = prometheus.NewCounter(prometheus.CounterOpts{ M_Api_Dashboard_Insert = prometheus.NewCounter(prometheus.CounterOpts{
Name: "api_models_dashboard_insert_total", Name: "api_models_dashboard_insert_total",
Help: "dashboards inserted ", Help: "dashboards inserted ",
Namespace: exporterName,
}) })
M_Alerting_Result_State = prometheus.NewCounterVec(prometheus.CounterOpts{ M_Alerting_Result_State = prometheus.NewCounterVec(prometheus.CounterOpts{
Name: "alerting_result_total", Name: "alerting_result_total",
Help: "alert execution result counter", Help: "alert execution result counter",
Namespace: exporterName,
}, []string{"state"}) }, []string{"state"})
M_Alerting_Notification_Sent = prometheus.NewCounterVec(prometheus.CounterOpts{ M_Alerting_Notification_Sent = prometheus.NewCounterVec(prometheus.CounterOpts{
Name: "alerting_notification_sent_total", Name: "alerting_notification_sent_total",
Help: "counter for how many alert notifications been sent", Help: "counter for how many alert notifications been sent",
Namespace: exporterName,
}, []string{"type"}) }, []string{"type"})
M_Aws_CloudWatch_GetMetricStatistics = prometheus.NewCounter(prometheus.CounterOpts{ M_Aws_CloudWatch_GetMetricStatistics = prometheus.NewCounter(prometheus.CounterOpts{
Name: "aws_cloudwatch_get_metric_statistics_total", Name: "aws_cloudwatch_get_metric_statistics_total",
Help: "counter for getting metric statistics from aws", Help: "counter for getting metric statistics from aws",
Namespace: exporterName,
}) })
M_Aws_CloudWatch_ListMetrics = prometheus.NewCounter(prometheus.CounterOpts{ M_Aws_CloudWatch_ListMetrics = prometheus.NewCounter(prometheus.CounterOpts{
Name: "aws_cloudwatch_list_metrics_total", Name: "aws_cloudwatch_list_metrics_total",
Help: "counter for getting list of metrics from aws", Help: "counter for getting list of metrics from aws",
Namespace: exporterName,
}) })
M_DB_DataSource_QueryById = prometheus.NewCounter(prometheus.CounterOpts{ M_DB_DataSource_QueryById = prometheus.NewCounter(prometheus.CounterOpts{
Name: "db_datasource_query_by_id_total", Name: "db_datasource_query_by_id_total",
Help: "counter for getting datasource by id", Help: "counter for getting datasource by id",
Namespace: exporterName,
}) })
M_DataSource_ProxyReq_Timer = prometheus.NewSummary(prometheus.SummaryOpts{ M_DataSource_ProxyReq_Timer = prometheus.NewSummary(prometheus.SummaryOpts{
Name: "api_dataproxy_request_all", Name: "api_dataproxy_request_all",
Help: "summary for dashboard search duration", Help: "summary for dashboard search duration",
Namespace: exporterName,
}) })
M_Alerting_Execution_Time = prometheus.NewSummary(prometheus.SummaryOpts{ M_Alerting_Execution_Time = prometheus.NewSummary(prometheus.SummaryOpts{
Name: "alerting_execution_time_seconds", Name: "alerting_execution_time_seconds",
Help: "summary of alert exeuction duration", Help: "summary of alert exeuction duration",
Namespace: exporterName,
}) })
M_Alerting_Active_Alerts = prometheus.NewGauge(prometheus.GaugeOpts{ M_Alerting_Active_Alerts = prometheus.NewGauge(prometheus.GaugeOpts{
Name: "alerting_active_alerts", Name: "alerting_active_alerts",
Help: "amount of active alerts", Help: "amount of active alerts",
Namespace: exporterName,
}) })
M_StatTotal_Dashboards = prometheus.NewGauge(prometheus.GaugeOpts{ M_StatTotal_Dashboards = prometheus.NewGauge(prometheus.GaugeOpts{
Name: "stat_totals_dashboard", Name: "stat_totals_dashboard",
Help: "total amount of dashboards", Help: "total amount of dashboards",
Namespace: exporterName,
}) })
M_StatTotal_Users = prometheus.NewGauge(prometheus.GaugeOpts{ M_StatTotal_Users = prometheus.NewGauge(prometheus.GaugeOpts{
Name: "stat_total_users", Name: "stat_total_users",
Help: "total amount of users", Help: "total amount of users",
Namespace: exporterName,
}) })
M_StatTotal_Orgs = prometheus.NewGauge(prometheus.GaugeOpts{ M_StatTotal_Orgs = prometheus.NewGauge(prometheus.GaugeOpts{
Name: "stat_total_orgs", Name: "stat_total_orgs",
Help: "total amount of orgs", Help: "total amount of orgs",
Namespace: exporterName,
}) })
M_StatTotal_Playlists = prometheus.NewGauge(prometheus.GaugeOpts{ M_StatTotal_Playlists = prometheus.NewGauge(prometheus.GaugeOpts{
Name: "stat_total_playlists", Name: "stat_total_playlists",
Help: "total amount of playlists", Help: "total amount of playlists",
Namespace: exporterName,
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment