@@ -452,7 +452,7 @@ local instance_template = grafana.template.new(
452
452
fill=0 ,
453
453
)
454
454
.addTarget(prometheus.target(
455
- 'rate(traces_receiver_accepted_spans {' + host_matcher + ',receiver!="otlp/lb"}[$__rate_interval])' ,
455
+ 'rate(traces_receiver_accepted_spans_total {' + host_matcher + ',receiver!="otlp/lb"}[$__rate_interval])' ,
456
456
legendFormat='{{ instance }} - {{ receiver }}/{{ transport }}' ,
457
457
)) +
458
458
utils.timeSeriesOverride(unit='short' );
@@ -468,7 +468,7 @@ local instance_template = grafana.template.new(
468
468
fill=0 ,
469
469
)
470
470
.addTarget(prometheus.target(
471
- 'rate(traces_receiver_refused_spans {' + host_matcher + ',receiver!="otlp/lb"}[$__rate_interval])' ,
471
+ 'rate(traces_receiver_refused_spans_total {' + host_matcher + ',receiver!="otlp/lb"}[$__rate_interval])' ,
472
472
legendFormat='{{ instance }} - {{ receiver }}/{{ transport }}' ,
473
473
)) +
474
474
utils.timeSeriesOverride(unit='short' );
@@ -484,7 +484,7 @@ local instance_template = grafana.template.new(
484
484
fill=0 ,
485
485
)
486
486
.addTarget(prometheus.target(
487
- 'rate(traces_exporter_sent_spans {' + host_matcher + ',exporter!="otlp"}[$__rate_interval])' ,
487
+ 'rate(traces_exporter_sent_spans_total {' + host_matcher + ',exporter!="otlp"}[$__rate_interval])' ,
488
488
legendFormat='{{ instance }} - {{ exporter }}' ,
489
489
)) +
490
490
utils.timeSeriesOverride(unit='short' );
@@ -500,7 +500,7 @@ local instance_template = grafana.template.new(
500
500
fill=0 ,
501
501
)
502
502
.addTarget(prometheus.target(
503
- 'rate(traces_exporter_send_failed_spans {' + host_matcher + ',exporter!="otlp"}[$__rate_interval])' ,
503
+ 'rate(traces_exporter_send_failed_spans_total {' + host_matcher + ',exporter!="otlp"}[$__rate_interval])' ,
504
504
legendFormat='{{ instance }} - {{ exporter }}' ,
505
505
)) +
506
506
utils.timeSeriesOverride(unit='short' );
@@ -515,11 +515,11 @@ local instance_template = grafana.template.new(
515
515
fill=1 ,
516
516
)
517
517
.addTarget(prometheus.target(
518
- 'sum(rate(traces_receiver_accepted_spans {' + host_matcher + ',%s}[$__rate_interval]))' % receiverFilter,
518
+ 'sum(rate(traces_receiver_accepted_spans_total {' + host_matcher + ',%s}[$__rate_interval]))' % receiverFilter,
519
519
legendFormat='Accepted' ,
520
520
))
521
521
.addTarget(prometheus.target(
522
- 'sum(rate(traces_receiver_refused_spans {' + host_matcher + ',%s}[$__rate_interval])) ' % receiverFilter,
522
+ 'sum(rate(traces_receiver_refused_spans_total {' + host_matcher + ',%s}[$__rate_interval])) ' % receiverFilter,
523
523
legendFormat='Refused' ,
524
524
)) +
525
525
utils.timeSeriesOverride(unit='short' );
@@ -534,11 +534,11 @@ local instance_template = grafana.template.new(
534
534
fill=1 ,
535
535
)
536
536
.addTarget(prometheus.target(
537
- 'sum(rate(traces_exporter_sent_spans {' + host_matcher + ',%s}[$__rate_interval]))' % exporterFilter,
537
+ 'sum(rate(traces_exporter_sent_spans_total {' + host_matcher + ',%s}[$__rate_interval]))' % exporterFilter,
538
538
legendFormat='Sent' ,
539
539
))
540
540
.addTarget(prometheus.target(
541
- 'sum(rate(traces_exporter_send_failed_spans {' + host_matcher + ',%s}[$__rate_interval]))' % exporterFilter,
541
+ 'sum(rate(traces_exporter_send_failed_spans_total {' + host_matcher + ',%s}[$__rate_interval]))' % exporterFilter,
542
542
legendFormat='Send failed' ,
543
543
)) +
544
544
utils.timeSeriesOverride(unit='short' );
@@ -596,13 +596,15 @@ local instance_template = grafana.template.new(
596
596
.addPanel(exportedFailedSpans)
597
597
.addPanel(receivedSpans('receiver!="otlp/lb"' , 6 ))
598
598
.addPanel(exportedSpans('exporter!="otlp"' , 6 ))
599
- )
600
- .addRow(
601
- row.new('Load balancing' )
602
- .addPanel(loadBalancedSpans)
603
- .addPanel(peersNum)
604
- .addPanel(receivedSpans('receiver="otlp/lb"' , 3 ))
605
- .addPanel(exportedSpans('exporter="otlp"' , 3 ))
606
599
),
600
+ // TODO(ptodev): Uncomment this when Collector has instrumeneted LB exporter using OTel:
601
+ // https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29867
602
+ // .addRow(
603
+ // row.new('Load balancing')
604
+ // .addPanel(loadBalancedSpans)
605
+ // .addPanel(peersNum)
606
+ // .addPanel(receivedSpans('receiver="otlp/lb"', 3))
607
+ // .addPanel(exportedSpans('exporter="otlp"', 3))
608
+ // ),
607
609
},
608
610
}
0 commit comments