From ce7b48143a92647b7d9d44fbf50b0a496f30799a Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 14 Dec 2015 17:17:59 -0600
Subject: [PATCH] 0.3.0: mailchimp & memcached
---
plugins/lustre2/lustre2.go | 2 +-
plugins/mailchimp/mailchimp.go | 61 ++++++++++++++++++----------------
plugins/memcached/memcached.go | 6 ++--
3 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/plugins/lustre2/lustre2.go b/plugins/lustre2/lustre2.go
index 64af3050..29cd06ac 100644
--- a/plugins/lustre2/lustre2.go
+++ b/plugins/lustre2/lustre2.go
@@ -173,7 +173,7 @@ func (l *Lustre2) GetLustreProcStats(fileglob string, wanted_fields []*mapping,
}
}
}
- acc.AddFields("lustre2", fields)
+ acc.AddFields("lustre2", fields, tags)
}
return nil
}
diff --git a/plugins/mailchimp/mailchimp.go b/plugins/mailchimp/mailchimp.go
index c1c7027f..d26d479a 100644
--- a/plugins/mailchimp/mailchimp.go
+++ b/plugins/mailchimp/mailchimp.go
@@ -75,35 +75,38 @@ func gatherReport(acc plugins.Accumulator, report Report, now time.Time) {
tags := make(map[string]string)
tags["id"] = report.ID
tags["campaign_title"] = report.CampaignTitle
- acc.Add("emails_sent", report.EmailsSent, tags, now)
- acc.Add("abuse_reports", report.AbuseReports, tags, now)
- acc.Add("unsubscribed", report.Unsubscribed, tags, now)
- acc.Add("hard_bounces", report.Bounces.HardBounces, tags, now)
- acc.Add("soft_bounces", report.Bounces.SoftBounces, tags, now)
- acc.Add("syntax_errors", report.Bounces.SyntaxErrors, tags, now)
- acc.Add("forwards_count", report.Forwards.ForwardsCount, tags, now)
- acc.Add("forwards_opens", report.Forwards.ForwardsOpens, tags, now)
- acc.Add("opens_total", report.Opens.OpensTotal, tags, now)
- acc.Add("unique_opens", report.Opens.UniqueOpens, tags, now)
- acc.Add("open_rate", report.Opens.OpenRate, tags, now)
- acc.Add("clicks_total", report.Clicks.ClicksTotal, tags, now)
- acc.Add("unique_clicks", report.Clicks.UniqueClicks, tags, now)
- acc.Add("unique_subscriber_clicks", report.Clicks.UniqueSubscriberClicks, tags, now)
- acc.Add("click_rate", report.Clicks.ClickRate, tags, now)
- acc.Add("facebook_recipient_likes", report.FacebookLikes.RecipientLikes, tags, now)
- acc.Add("facebook_unique_likes", report.FacebookLikes.UniqueLikes, tags, now)
- acc.Add("facebook_likes", report.FacebookLikes.FacebookLikes, tags, now)
- acc.Add("industry_type", report.IndustryStats.Type, tags, now)
- acc.Add("industry_open_rate", report.IndustryStats.OpenRate, tags, now)
- acc.Add("industry_click_rate", report.IndustryStats.ClickRate, tags, now)
- acc.Add("industry_bounce_rate", report.IndustryStats.BounceRate, tags, now)
- acc.Add("industry_unopen_rate", report.IndustryStats.UnopenRate, tags, now)
- acc.Add("industry_unsub_rate", report.IndustryStats.UnsubRate, tags, now)
- acc.Add("industry_abuse_rate", report.IndustryStats.AbuseRate, tags, now)
- acc.Add("list_stats_sub_rate", report.ListStats.SubRate, tags, now)
- acc.Add("list_stats_unsub_rate", report.ListStats.UnsubRate, tags, now)
- acc.Add("list_stats_open_rate", report.ListStats.OpenRate, tags, now)
- acc.Add("list_stats_click_rate", report.ListStats.ClickRate, tags, now)
+ fields := map[string]interface{}{
+ "emails_sent": report.EmailsSent,
+ "abuse_reports": report.AbuseReports,
+ "unsubscribed": report.Unsubscribed,
+ "hard_bounces": report.Bounces.HardBounces,
+ "soft_bounces": report.Bounces.SoftBounces,
+ "syntax_errors": report.Bounces.SyntaxErrors,
+ "forwards_count": report.Forwards.ForwardsCount,
+ "forwards_opens": report.Forwards.ForwardsOpens,
+ "opens_total": report.Opens.OpensTotal,
+ "unique_opens": report.Opens.UniqueOpens,
+ "open_rate": report.Opens.OpenRate,
+ "clicks_total": report.Clicks.ClicksTotal,
+ "unique_clicks": report.Clicks.UniqueClicks,
+ "unique_subscriber_clicks": report.Clicks.UniqueSubscriberClicks,
+ "click_rate": report.Clicks.ClickRate,
+ "facebook_recipient_likes": report.FacebookLikes.RecipientLikes,
+ "facebook_unique_likes": report.FacebookLikes.UniqueLikes,
+ "facebook_likes": report.FacebookLikes.FacebookLikes,
+ "industry_type": report.IndustryStats.Type,
+ "industry_open_rate": report.IndustryStats.OpenRate,
+ "industry_click_rate": report.IndustryStats.ClickRate,
+ "industry_bounce_rate": report.IndustryStats.BounceRate,
+ "industry_unopen_rate": report.IndustryStats.UnopenRate,
+ "industry_unsub_rate": report.IndustryStats.UnsubRate,
+ "industry_abuse_rate": report.IndustryStats.AbuseRate,
+ "list_stats_sub_rate": report.ListStats.SubRate,
+ "list_stats_unsub_rate": report.ListStats.UnsubRate,
+ "list_stats_open_rate": report.ListStats.OpenRate,
+ "list_stats_click_rate": report.ListStats.ClickRate,
+ }
+ acc.AddFields("mailchimp", fields, tags, now)
}
func init() {
diff --git a/plugins/memcached/memcached.go b/plugins/memcached/memcached.go
index 9919b0c2..5aba8c9f 100644
--- a/plugins/memcached/memcached.go
+++ b/plugins/memcached/memcached.go
@@ -137,16 +137,18 @@ func (m *Memcached) gatherServer(
tags := map[string]string{"server": address}
// Process values
+ fields := make(map[string]interface{})
for _, key := range sendMetrics {
if value, ok := values[key]; ok {
// Mostly it is the number
if iValue, errParse := strconv.ParseInt(value, 10, 64); errParse != nil {
- acc.Add(key, value, tags)
+ fields[key] = iValue
} else {
- acc.Add(key, iValue, tags)
+ fields[key] = value
}
}
}
+ acc.AddFields("memcached", fields, tags)
return nil
}
--
GitLab