Skip to content

Update to work with gateway release 0.4.0 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
king-jam wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to work with gateway release 0.4.0 #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5567735
Update to work with gateway release 0.4.0
king-jam Dec 15, 2017
f10a85f
Fixed references to ts that I missed in previous commit
king-jam Dec 17, 2017
7750ba7
Added Job Name Updates
king-jam Jan 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions prometheus/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@ func (p *prometheusPublisher) GetConfigPolicy() (*cpolicy.ConfigPolicy, error) {
r4.Description = "Prometheus debug"
config.Add(r4)

r5, err := cpolicy.NewStringRule("jobName", false)
if err != nil {
panic(err)
}
r5.Description = "Prometheus Job Name - defaults to unused"
config.Add(r5)

cp.Add([]string{""}, config)
return cp, nil
}
Expand Down Expand Up @@ -150,39 +157,41 @@ func sendMetrics(config map[string]ctypes.ConfigValue, promUrl *url.URL, client
logger := getLogger(config)
buf := new(bytes.Buffer)
for _, m := range metrics {
name, tags, value, ts := mangleMetric(m)
buf.WriteString(prometheusString(name, tags, value, ts))
name, tags, value := mangleMetric(m)
buf.WriteString(prometheusString(name, tags, value))
buf.WriteByte('\n')
}

req, err := http.NewRequest("PUT", promUrl.String(), bytes.NewReader(buf.Bytes()))
if err != nil {
logger.Errorf("Error creating request: %v", err)
return
}
req.Header.Set("Content-Type", "text/plain; version=0.0.4")
res, err := client.Conn.Do(req)
if err != nil {
logger.Error("Error sending data to Prometheus: %v", err)
logger.Errorf("Error sending data to Prometheus: %v", err)
return
}
defer res.Body.Close()
_, err = ioutil.ReadAll(res.Body)
if err != nil {
logger.Error("Error getting Prometheus response: %v", err)
logger.Errorf("Error getting Prometheus response: %v", err)
}
}

func prometheusString(name string, tags map[string]string, value string, ts int64) string {
func prometheusString(name string, tags map[string]string, value string) string {
tmp1 := []string{}
for k, v := range tags {
tmp1 = append(tmp1, fmt.Sprintf("%s=\"%s\"", k, v))
}
return fmt.Sprintf("%s{%s} %s %d",
return fmt.Sprintf("%s{%s} %s",
name,
strings.Join(tmp1, ","),
value,
ts,
)
}

func mangleMetric(m plugin.MetricType) (name string, tags map[string]string, value string, ts int64) {
func mangleMetric(m plugin.MetricType) (name string, tags map[string]string, value string) {
tags = make(map[string]string)
ns := m.Namespace().Strings()
isDynamic, indexes := m.Namespace().IsDynamic()
Expand Down Expand Up @@ -227,7 +236,6 @@ func mangleMetric(m plugin.MetricType) (name string, tags map[string]string, val

name = strings.Join(ns, "_")
value = fmt.Sprint(m.Data())
ts = m.Timestamp().Unix() * 1000
return
}

Expand All @@ -236,8 +244,11 @@ func prometheusUrl(config map[string]ctypes.ConfigValue) (*url.URL, error) {
if config["https"].(ctypes.ConfigValueBool).Value {
prefix = "https"
}

u, err := url.Parse(fmt.Sprintf("%s://%s:%d/metrics/job/unused", prefix, config["host"].(ctypes.ConfigValueStr).Value, config["port"].(ctypes.ConfigValueInt).Value))
var jobName = "unused"
if _, ok := config["job"]; ok {
jobName = config["job"].(ctypes.ConfigValueStr).Value
}
u, err := url.Parse(fmt.Sprintf("%s://%s:%d/metrics/job/%s", prefix, config["host"].(ctypes.ConfigValueStr).Value, config["port"].(ctypes.ConfigValueInt).Value, jobName))
if err != nil {
return nil, err
}
Expand Down