ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2025-08-16 15:43:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use common functions in both Ganglia sinks

Browse Source
This commit is contained in:
Thomas Roehl
2022-02-18 15:05:45 +01:00
parent e2f78fe1c0
commit d9a81501e5
3 changed files with 73 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sinks/gangliaSink.go
View File

@@ -22,6 +22,8 @@ type GangliaSinkConfig struct {
GmetricConfig string `json:"gmetric_config,omitempty"`
AddGangliaGroup bool `json:"add_ganglia_group,omitempty"`
AddTagsAsDesc bool `json:"add_tags_as_desc,omitempty"`
ClusterName string `json:"cluster_name,omitempty"`
AddTypeToName bool `json:"add_type_to_name,omitempty"`
}
type GangliaSink struct {
@@ -82,8 +84,6 @@ func (s *GangliaSink) Write(point lp.CCMetric) error {
for key, value := range point.Tags() {
switch key {
case "cluster":
argstr = append(argstr, fmt.Sprintf("--cluster=%s", value))
case "unit":
argstr = append(argstr, fmt.Sprintf("--units=%s", value))
default:
@@ -93,8 +93,6 @@ func (s *GangliaSink) Write(point lp.CCMetric) error {
if s.config.MetaAsTags {
for key, value := range point.Meta() {
switch key {
case "cluster":
argstr = append(argstr, fmt.Sprintf("--cluster=%s", value))
case "unit":
argstr = append(argstr, fmt.Sprintf("--units=%s", value))
default:
@@ -102,13 +100,28 @@ func (s *GangliaSink) Write(point lp.CCMetric) error {
}
}
}
if len(s.config.ClusterName) > 0 {
argstr = append(argstr, fmt.Sprintf("--cluster=%s", s.config.ClusterName))
}
if s.config.AddTagsAsDesc && len(tagsstr) > 0 {
argstr = append(argstr, fmt.Sprintf("--desc=%q", strings.Join(tagsstr, ",")))
}
if len(s.gmetric_config) > 0 {
argstr = append(argstr, fmt.Sprintf("--conf=%s", s.gmetric_config))
}
argstr = append(argstr, fmt.Sprintf("--name=%s", point.Name()))
name := GangliaMetricRename(point)
if s.config.AddTypeToName {
argstr = append(argstr, fmt.Sprintf("--name=%s", GangliaMetricName(point)))
} else {
argstr = append(argstr, fmt.Sprintf("--name=%s", name))
}
slope := GangliaSlopeType(point)
slopeStr := "both"
if slope == 0 {
slopeStr = "zero"
}
argstr = append(argstr, fmt.Sprintf("--slope=%s", slopeStr))
for k, v := range point.Fields() {
if k == "value" {
switch value := v.(type) {