diff --git a/comp/core/agenttelemetry/impl/config.go b/comp/core/agenttelemetry/impl/config.go index 2ba67716b621..bdade84bac37 100644 --- a/comp/core/agenttelemetry/impl/config.go +++ b/comp/core/agenttelemetry/impl/config.go @@ -219,7 +219,11 @@ var defaultProfiles = ` zero_metric: true metrics: - name: dogstatsd.udp_packets_bytes + aggregate_tags: + - remote_agent - name: dogstatsd.uds_packets_bytes + aggregate_tags: + - remote_agent - name: logs.bytes_missed - name: logs.bytes_sent aggregate_tags: diff --git a/comp/dogstatsd/listeners/telemetry.go b/comp/dogstatsd/listeners/telemetry.go index 25c6011243f0..500b0be94bc7 100644 --- a/comp/dogstatsd/listeners/telemetry.go +++ b/comp/dogstatsd/listeners/telemetry.go @@ -37,13 +37,13 @@ func NewTelemetryStore(buckets []float64, telemetrycomp telemetry.Component) *Te tlmUDPPackets: telemetrycomp.NewCounter("dogstatsd", "udp_packets", []string{"state"}, "Dogstatsd UDP packets count"), tlmUDPPacketsBytes: telemetrycomp.NewCounter("dogstatsd", "udp_packets_bytes", - nil, "Dogstatsd UDP packets bytes count"), + []string{"remote_agent"}, "Dogstatsd UDP packets bytes count"), tlmUDSPackets: telemetrycomp.NewCounter("dogstatsd", "uds_packets", []string{"listener_id", "transport", "state"}, "Dogstatsd UDS packets count"), tlmUDSOriginDetectionError: telemetrycomp.NewCounter("dogstatsd", "uds_origin_detection_error", []string{"listener_id", "transport"}, "Dogstatsd UDS origin detection error count"), tlmUDSPacketsBytes: telemetrycomp.NewCounter("dogstatsd", "uds_packets_bytes", - []string{"listener_id", "transport"}, "Dogstatsd UDS packets bytes"), + []string{"remote_agent", "listener_id", "transport"}, "Dogstatsd UDS packets bytes"), tlmUDSConnections: telemetrycomp.NewGauge("dogstatsd", "uds_connections", []string{"listener_id", "transport"}, "Dogstatsd UDS connections count"), tlmListener: telemetrycomp.NewHistogram( diff --git a/comp/dogstatsd/listeners/udp.go b/comp/dogstatsd/listeners/udp.go index 39c1d9680c0b..b6a70881c3ea 100644 --- a/comp/dogstatsd/listeners/udp.go +++ b/comp/dogstatsd/listeners/udp.go @@ -144,7 +144,7 @@ func (l *UDPListener) listen() { l.telemetryStore.tlmUDPPackets.Inc("ok") udpBytes.Add(int64(n)) - l.telemetryStore.tlmUDPPacketsBytes.Add(float64(n)) + l.telemetryStore.tlmUDPPacketsBytes.Add(float64(n), "agent") // packetAssembler merges multiple packets together and sends them when its buffer is full l.packetAssembler.AddMessage(l.buffer[:n]) diff --git a/comp/dogstatsd/listeners/uds_common.go b/comp/dogstatsd/listeners/uds_common.go index ad0f69016361..9feef7847467 100644 --- a/comp/dogstatsd/listeners/uds_common.go +++ b/comp/dogstatsd/listeners/uds_common.go @@ -373,7 +373,7 @@ func (l *UDSListener) handleConnection(conn netUnixConn, closeFunc CloseFunction l.telemetryStore.tlmUDSPackets.Inc(tlmListenerID, l.transport, "ok") udsBytes.Add(int64(n)) - l.telemetryStore.tlmUDSPacketsBytes.Add(float64(n), tlmListenerID, l.transport) + l.telemetryStore.tlmUDSPacketsBytes.Add(float64(n), "agent", tlmListenerID, l.transport) packet.Contents = packet.Buffer[:n] packet.Source = packets.UDS packet.ListenerID = listenerID @@ -421,5 +421,5 @@ func (l *UDSListener) clearTelemetry(id string) { l.telemetryStore.tlmUDSConnections.Delete(id, l.transport) l.telemetryStore.tlmUDSPackets.Delete(id, l.transport, "error") l.telemetryStore.tlmUDSPackets.Delete(id, l.transport, "ok") - l.telemetryStore.tlmUDSPacketsBytes.Delete(id, l.transport) + l.telemetryStore.tlmUDSPacketsBytes.Delete("agent", id, l.transport) }