Merge release branch into master branch [skip ci]

CHANGELOG.md

@@ -1,5 +1,114 @@
 # Change Log
 
+## [v2.4.0](https://github.com/nubisproject/nubis-prometheus/tree/v2.4.0) (2019-03-06)
+[Full Changelog](https://github.com/nubisproject/nubis-prometheus/compare/v1.3.0...v2.4.0)
+
+**Closed issues:**
+
+- Predict disk checks tmpfs [\#391](https://github.com/nubisproject/nubis-prometheus/issues/391)
+- Tag v2.3.1 release [\#388](https://github.com/nubisproject/nubis-prometheus/issues/388)
+- Tag v2.3.1 release [\#385](https://github.com/nubisproject/nubis-prometheus/issues/385)
+- Tag v2.3.0 release [\#382](https://github.com/nubisproject/nubis-prometheus/issues/382)
+- Tag v2.3.0 release [\#379](https://github.com/nubisproject/nubis-prometheus/issues/379)
+- Tag v2.3.0 release [\#376](https://github.com/nubisproject/nubis-prometheus/issues/376)
+- Prometheus startup script calls a consul kv value that doesn't exist [\#374](https://github.com/nubisproject/nubis-prometheus/issues/374)
+- Fix metadata error on boot [\#372](https://github.com/nubisproject/nubis-prometheus/issues/372)
+- Tag v2.3.0 release [\#369](https://github.com/nubisproject/nubis-prometheus/issues/369)
+- Tag v2.3.0 release [\#366](https://github.com/nubisproject/nubis-prometheus/issues/366)
+- Tag v2.3.0 release [\#362](https://github.com/nubisproject/nubis-prometheus/issues/362)
+- Tag v2.3.0 release [\#359](https://github.com/nubisproject/nubis-prometheus/issues/359)
+- Scrape Redis CloudWatch metrics [\#357](https://github.com/nubisproject/nubis-prometheus/issues/357)
+- Support gracefully reloading configuration for services that support it [\#351](https://github.com/nubisproject/nubis-prometheus/issues/351)
+- Categorize other alerts [\#349](https://github.com/nubisproject/nubis-prometheus/issues/349)
+- \[notifications\] Categorize cron alerts as non-critical [\#346](https://github.com/nubisproject/nubis-prometheus/issues/346)
+- Slack notification to all alert routes [\#344](https://github.com/nubisproject/nubis-prometheus/issues/344)
+- Upgrade Traefik to 1.5.4 [\#342](https://github.com/nubisproject/nubis-prometheus/issues/342)
+- Upgrade blackbox\_exporter to 0.12.0 [\#341](https://github.com/nubisproject/nubis-prometheus/issues/341)
+- Upgrade AlertManager to 0.14.0 [\#340](https://github.com/nubisproject/nubis-prometheus/issues/340)
+- Upgrade to Prometheus 2.2.1 [\#339](https://github.com/nubisproject/nubis-prometheus/issues/339)
+- Tag v2.2.0 release [\#336](https://github.com/nubisproject/nubis-prometheus/issues/336)
+- \[TF\] Cleanup for 0.11.x [\#334](https://github.com/nubisproject/nubis-prometheus/issues/334)
+- Rename 'sink' alert route to something more descriptive [\#330](https://github.com/nubisproject/nubis-prometheus/issues/330)
+- Tag project with platform tag [\#328](https://github.com/nubisproject/nubis-prometheus/issues/328)
+- \[VarnishCacheHitRateTooLow\] Don't alert if overall traffic is minimal [\#324](https://github.com/nubisproject/nubis-prometheus/issues/324)
+- Cleanup old pagerduty integration [\#322](https://github.com/nubisproject/nubis-prometheus/issues/322)
+- \[monitoring\] TimeSanity: 15 minutes too short of a time for NTP state to settle [\#320](https://github.com/nubisproject/nubis-prometheus/issues/320)
+- \[pagerduty\] Add more pagerduty integration [\#318](https://github.com/nubisproject/nubis-prometheus/issues/318)
+- Tag v2.1.0 release [\#314](https://github.com/nubisproject/nubis-prometheus/issues/314)
+- Fixing prometheus rules [\#313](https://github.com/nubisproject/nubis-prometheus/issues/313)
+- Tag v2.1.0 release [\#310](https://github.com/nubisproject/nubis-prometheus/issues/310)
+- Use base's swap support in favor of our own solution [\#308](https://github.com/nubisproject/nubis-prometheus/issues/308)
+- Tag v2.1.0 release [\#305](https://github.com/nubisproject/nubis-prometheus/issues/305)
+- \[pagerduty\] handle \<UNSET\> as magical value [\#303](https://github.com/nubisproject/nubis-prometheus/issues/303)
+- Tag v2.1.0 release [\#300](https://github.com/nubisproject/nubis-prometheus/issues/300)
+- Improve Monitoring Coverage [\#298](https://github.com/nubisproject/nubis-prometheus/issues/298)
+- \[traefik\] Upgrade to 1.4.6 [\#294](https://github.com/nubisproject/nubis-prometheus/issues/294)
+- \[backup\] S3 sync doesn't support empty files [\#292](https://github.com/nubisproject/nubis-prometheus/issues/292)
+- Tag v2.0.4 release [\#290](https://github.com/nubisproject/nubis-prometheus/issues/290)
+- \[alerts\] Group by project [\#287](https://github.com/nubisproject/nubis-prometheus/issues/287)
+
+**Merged pull requests:**
+
+- We don't need to check tmpfs for predict disk [\#392](https://github.com/nubisproject/nubis-prometheus/pull/392) ([limed](https://github.com/limed))
+- Update CHANGELOG for v2.3.1 release \[skip ci\] [\#390](https://github.com/nubisproject/nubis-prometheus/pull/390) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.1 release \[skip ci\] [\#389](https://github.com/nubisproject/nubis-prometheus/pull/389) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.1 release \[skip ci\] [\#387](https://github.com/nubisproject/nubis-prometheus/pull/387) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.1 release \[skip ci\] [\#386](https://github.com/nubisproject/nubis-prometheus/pull/386) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#384](https://github.com/nubisproject/nubis-prometheus/pull/384) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#383](https://github.com/nubisproject/nubis-prometheus/pull/383) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#381](https://github.com/nubisproject/nubis-prometheus/pull/381) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#380](https://github.com/nubisproject/nubis-prometheus/pull/380) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#378](https://github.com/nubisproject/nubis-prometheus/pull/378) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#377](https://github.com/nubisproject/nubis-prometheus/pull/377) ([nubis-automation](https://github.com/nubis-automation))
+- Fixing prometheus startup script [\#375](https://github.com/nubisproject/nubis-prometheus/pull/375) ([limed](https://github.com/limed))
+- Fix metadata error on boot [\#373](https://github.com/nubisproject/nubis-prometheus/pull/373) ([tinnightcap](https://github.com/tinnightcap))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#371](https://github.com/nubisproject/nubis-prometheus/pull/371) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#370](https://github.com/nubisproject/nubis-prometheus/pull/370) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#368](https://github.com/nubisproject/nubis-prometheus/pull/368) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#367](https://github.com/nubisproject/nubis-prometheus/pull/367) ([nubis-automation](https://github.com/nubis-automation))
+- Updated graph to split with project [\#365](https://github.com/nubisproject/nubis-prometheus/pull/365) ([limed](https://github.com/limed))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#364](https://github.com/nubisproject/nubis-prometheus/pull/364) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#363](https://github.com/nubisproject/nubis-prometheus/pull/363) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#361](https://github.com/nubisproject/nubis-prometheus/pull/361) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.3.0 release \[skip ci\] [\#360](https://github.com/nubisproject/nubis-prometheus/pull/360) ([nubis-automation](https://github.com/nubis-automation))
+- Add Redis CloudWatch metrics [\#358](https://github.com/nubisproject/nubis-prometheus/pull/358) ([gozer](https://github.com/gozer))
+- fix tyop [\#356](https://github.com/nubisproject/nubis-prometheus/pull/356) ([gozer](https://github.com/gozer))
+- Include additional metrics in eposition format [\#355](https://github.com/nubisproject/nubis-prometheus/pull/355) ([tinnightcap](https://github.com/tinnightcap))
+- Reload configuration for services that support it, restart otherwise [\#352](https://github.com/nubisproject/nubis-prometheus/pull/352) ([gozer](https://github.com/gozer))
+- Categorize some other alerts as non-critical [\#350](https://github.com/nubisproject/nubis-prometheus/pull/350) ([limed](https://github.com/limed))
+- Cron no longer categorized as critical [\#348](https://github.com/nubisproject/nubis-prometheus/pull/348) ([limed](https://github.com/limed))
+- Make sure slack notifications show up on all alerts [\#347](https://github.com/nubisproject/nubis-prometheus/pull/347) ([limed](https://github.com/limed))
+- Upgrade Prometheus, AlertManager, Traefik & blackbox\_exporter [\#343](https://github.com/nubisproject/nubis-prometheus/pull/343) ([gozer](https://github.com/gozer))
+- Update CHANGELOG for v2.2.0 release \[skip ci\] [\#338](https://github.com/nubisproject/nubis-prometheus/pull/338) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.2.0 release \[skip ci\] [\#337](https://github.com/nubisproject/nubis-prometheus/pull/337) ([nubis-automation](https://github.com/nubis-automation))
+- Fix \#334 [\#335](https://github.com/nubisproject/nubis-prometheus/pull/335) ([gozer](https://github.com/gozer))
+- Cleanup alert routing [\#333](https://github.com/nubisproject/nubis-prometheus/pull/333) ([limed](https://github.com/limed))
+- All these alerts are for fluentd-elasticsearch so we just tag them as nubis [\#332](https://github.com/nubisproject/nubis-prometheus/pull/332) ([limed](https://github.com/limed))
+- Fixing up all rules and fixing up alert routes [\#331](https://github.com/nubisproject/nubis-prometheus/pull/331) ([limed](https://github.com/limed))
+- Tag project as a platform component [\#329](https://github.com/nubisproject/nubis-prometheus/pull/329) ([limed](https://github.com/limed))
+- Fixing broken rule [\#327](https://github.com/nubisproject/nubis-prometheus/pull/327) ([limed](https://github.com/limed))
+- Limit alerting to Varnish if it's seeing at least a non-trivial amount of overall traffic [\#325](https://github.com/nubisproject/nubis-prometheus/pull/325) ([gozer](https://github.com/gozer))
+- Remove old pagerduty integration key [\#323](https://github.com/nubisproject/nubis-prometheus/pull/323) ([limed](https://github.com/limed))
+- Give NTPd 30 minutes to stabilize [\#321](https://github.com/nubisproject/nubis-prometheus/pull/321) ([gozer](https://github.com/gozer))
+- Added support for pagerduty integration [\#319](https://github.com/nubisproject/nubis-prometheus/pull/319) ([limed](https://github.com/limed))
+- Update nubis-travis [\#317](https://github.com/nubisproject/nubis-prometheus/pull/317) ([tinnightcap](https://github.com/tinnightcap))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#316](https://github.com/nubisproject/nubis-prometheus/pull/316) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#315](https://github.com/nubisproject/nubis-prometheus/pull/315) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#312](https://github.com/nubisproject/nubis-prometheus/pull/312) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#311](https://github.com/nubisproject/nubis-prometheus/pull/311) ([nubis-automation](https://github.com/nubis-automation))
+- Use base's support for swap now [\#309](https://github.com/nubisproject/nubis-prometheus/pull/309) ([gozer](https://github.com/gozer))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#307](https://github.com/nubisproject/nubis-prometheus/pull/307) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#306](https://github.com/nubisproject/nubis-prometheus/pull/306) ([nubis-automation](https://github.com/nubis-automation))
+- \[pagerduty\] Handle \<UNSET\> as magical disabled value [\#304](https://github.com/nubisproject/nubis-prometheus/pull/304) ([gozer](https://github.com/gozer))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#302](https://github.com/nubisproject/nubis-prometheus/pull/302) ([nubis-automation](https://github.com/nubis-automation))
+- Update CHANGELOG for v2.1.0 release \[skip ci\] [\#301](https://github.com/nubisproject/nubis-prometheus/pull/301) ([nubis-automation](https://github.com/nubis-automation))
+- Improve our monitoring coverage [\#299](https://github.com/nubisproject/nubis-prometheus/pull/299) ([gozer](https://github.com/gozer))
+- Initial sample documentation for Alerts [\#297](https://github.com/nubisproject/nubis-prometheus/pull/297) ([gozer](https://github.com/gozer))
+- Create .directory fake files to keep our empty directories from vanishing in S3 [\#293](https://github.com/nubisproject/nubis-prometheus/pull/293) ([gozer](https://github.com/gozer))
+- add missing liecnese [\#291](https://github.com/nubisproject/nubis-prometheus/pull/291) ([gozer](https://github.com/gozer))
+- Fixing graph again [\#289](https://github.com/nubisproject/nubis-prometheus/pull/289) ([limed](https://github.com/limed))
+- Add project to alert grouping [\#288](https://github.com/nubisproject/nubis-prometheus/pull/288) ([gozer](https://github.com/gozer))
+
 ## [v2.3.1](https://github.com/nubisproject/nubis-prometheus/tree/v2.3.1) (2018-08-21)
 [Full Changelog](https://github.com/nubisproject/nubis-prometheus/compare/v2.3.0...v2.3.1)
 

nubis/Puppetfile

@@ -3,7 +3,7 @@ forge "https://forgeapi.puppetlabs.com"
 mod 'spantree/upstart','0.0.3'
 
 mod 'bfraser/grafana',
-    :git => 'https://github.com/bfraser/puppet-grafana.git',
-    :ref => '6d426d5ccc52ff23dbbcfc45290dafd224b5d2bc'
+    :git => 'https://github.com/gozer/puppet-grafana.git',
+    :ref => 'c36f941a96202d99044bd039ff1e2710442fee65'
 
 mod 'puppetlabs/java', '1.6.0'

nubis/builder/artifacts/v2.4.0/AMIs.json

@@ -0,0 +1,13 @@
+{
+  "builds": [
+    {
+      "name": "amazon-ebs-ubuntu",
+      "builder_type": "amazon-ebs",
+      "build_time": 1551914183,
+      "files": null,
+      "artifact_id": "ap-northeast-1:ami-0f141a12b164d63dc,ap-northeast-2:ami-098e6a3b39be66c9c,ap-southeast-1:ami-096726accf0c198c8,ap-southeast-2:ami-0da89dce7697cb926,eu-central-1:ami-05a6a25e7a248ea88,eu-west-1:ami-0c254949b5907346d,sa-east-1:ami-01e3e344c0bfa3671,us-east-1:ami-0f77ceb36f2a0c3df,us-west-1:ami-055bd2a7ed1f37efb,us-west-2:ami-01ddb6b220cc27c2f",
+      "packer_run_uuid": "876f1ff3-af85-a4fd-1a60-522951735b09"
+    }
+  ],
+  "last_run_uuid": "876f1ff3-af85-a4fd-1a60-522951735b09"
+}