statsd private charts have incomplete context and title; fixes #3515
Costa Tsaousis (ktsaou) committed
Mar 11, 2018 at 14:55 UTC
1ef61e89c9c088c9c56a31fb92ed49add690b265
1 file changed
+32
-8
src/statsd.c
+32
-8
@@ -1466,14 +1466,20 @@ static inline void statsd_private_chart_gauge(STATSD_METRIC *m) {
1466
char type[RRD_ID_LENGTH_MAX + 1], id[RRD_ID_LENGTH_MAX + 1];
1467
statsd_get_metric_type_and_id(m, type, id, "gauge", RRD_ID_LENGTH_MAX);
1468
1469
+ char context[RRD_ID_LENGTH_MAX + 1];
1470
+ snprintfz(context, RRD_ID_LENGTH_MAX, "statsd_gauge.%s", m->name);
1471
+
1472
+ char title[RRD_ID_LENGTH_MAX + 1];
1473
+ snprintfz(title, RRD_ID_LENGTH_MAX, "statsd private chart for gauge %s", m->name);
1474
+
1475
m->st = statsd_private_rrdset_create(
1476
m
1477
, type
1478
, id
1479
, NULL // name
1480
, "gauges" // family (submenu)
1475
- , m->name // context
1476
- , m->name // title
1481
+ , context // context
1482
+ , title // title
1483
, "value" // units
1484
, STATSD_CHART_PRIORITY
1485
, statsd.update_every
@@ -1502,14 +1508,20 @@ static inline void statsd_private_chart_counter_or_meter(STATSD_METRIC *m, const
1508
char type[RRD_ID_LENGTH_MAX + 1], id[RRD_ID_LENGTH_MAX + 1];
1509
statsd_get_metric_type_and_id(m, type, id, dim, RRD_ID_LENGTH_MAX);
1510
1511
+ char context[RRD_ID_LENGTH_MAX + 1];
1512
+ snprintfz(context, RRD_ID_LENGTH_MAX, "statsd_%s.%s", dim, m->name);
1513
+
1514
+ char title[RRD_ID_LENGTH_MAX + 1];
1515
+ snprintfz(title, RRD_ID_LENGTH_MAX, "statsd private chart for %s %s", dim, m->name);
1516
+
1517
m->st = statsd_private_rrdset_create(
1518
m
1519
, type
1520
, id
1521
, NULL // name
1522
, family // family (submenu)
1511
- , m->name // context
1512
- , m->name // title
1523
+ , context // context
1524
+ , title // title
1525
, "events/s" // units
1526
, STATSD_CHART_PRIORITY
1527
, statsd.update_every
@@ -1538,14 +1550,20 @@ static inline void statsd_private_chart_set(STATSD_METRIC *m) {
1550
char type[RRD_ID_LENGTH_MAX + 1], id[RRD_ID_LENGTH_MAX + 1];
1551
statsd_get_metric_type_and_id(m, type, id, "set", RRD_ID_LENGTH_MAX);
1552
1553
+ char context[RRD_ID_LENGTH_MAX + 1];
1554
+ snprintfz(context, RRD_ID_LENGTH_MAX, "statsd_set.%s", m->name);
1555
+
1556
+ char title[RRD_ID_LENGTH_MAX + 1];
1557
+ snprintfz(title, RRD_ID_LENGTH_MAX, "statsd private chart for set %s", m->name);
1558
+
1559
m->st = statsd_private_rrdset_create(
1560
m
1561
, type
1562
, id
1563
, NULL // name
1564
, "sets" // family (submenu)
1547
- , m->name // context
1548
- , m->name // title
1565
+ , context // context
1566
+ , title // title
1567
, "entries" // units
1568
, STATSD_CHART_PRIORITY
1569
, statsd.update_every
@@ -1574,14 +1592,20 @@ static inline void statsd_private_chart_timer_or_histogram(STATSD_METRIC *m, con
1592
char type[RRD_ID_LENGTH_MAX + 1], id[RRD_ID_LENGTH_MAX + 1];
1593
statsd_get_metric_type_and_id(m, type, id, dim, RRD_ID_LENGTH_MAX);
1594
1595
+ char context[RRD_ID_LENGTH_MAX + 1];
1596
+ snprintfz(context, RRD_ID_LENGTH_MAX, "statsd_%s.%s", dim, m->name);
1597
+
1598
+ char title[RRD_ID_LENGTH_MAX + 1];
1599
+ snprintfz(title, RRD_ID_LENGTH_MAX, "statsd private chart for %s %s", dim, m->name);
1600
+
1601
m->st = statsd_private_rrdset_create(
1602
m
1603
, type
1604
, id
1605
, NULL // name
1606
, family // family (submenu)
1583
- , m->name // context
1584
- , m->name // title
1607
+ , context // context
1608
+ , title // title
1609
, units // units
1610
, STATSD_CHART_PRIORITY
1611
, statsd.update_every