Merge release branch into master [skip ci]

nubisproject · Mar 23, 2017 · bbfec83 · bbfec83
2 parents 964ffff + b41be98
commit bbfec83
Show file tree

Hide file tree

Showing 13 changed files with 222 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,25 @@
 # Change Log
 
-## [v1.3.0](https://github.com/nubisproject/nubis-db-admin/tree/v1.3.0) (2016-12-20)
+## [v1.4.0](https://github.com/nubisproject/nubis-db-admin/tree/v1.4.0) (2017-03-23)
+[Full Changelog](https://github.com/nubisproject/nubis-db-admin/compare/v1.3.0...v1.4.0)
+
+**Closed issues:**
+
+- Convert to Prometheus MySQL exporter [\#8](https://github.com/nubisproject/nubis-db-admin/issues/8)
+
+**Merged pull requests:**
+
+- Convert to Prometheus and MySQL Exporter [\#9](https://github.com/nubisproject/nubis-db-admin/pull/9) ([gozer](https://github.com/gozer))
+- Update builder artifacts for v1.4.0 release \[skip ci\] [\#7](https://github.com/nubisproject/nubis-db-admin/pull/7) ([tinnightcap](https://github.com/tinnightcap))
+
+## [v1.3.0](https://github.com/nubisproject/nubis-db-admin/tree/v1.3.0) (2016-12-21)
+**Closed issues:**
+
+- Tag v1.3.0 release [\#4](https://github.com/nubisproject/nubis-db-admin/issues/4)
+
 **Merged pull requests:**
 
+- Update CHANGELOG for v1.3.0 release [\#5](https://github.com/nubisproject/nubis-db-admin/pull/5) ([tinnightcap](https://github.com/tinnightcap))
 - update nubis-travis to v0.1.3 [\#3](https://github.com/nubisproject/nubis-db-admin/pull/3) ([gozer](https://github.com/gozer))
 - Enable nubis-travis v0.1.0 [\#2](https://github.com/nubisproject/nubis-db-admin/pull/2) ([gozer](https://github.com/gozer))
 - Initial implementation of a datadog-assisted RDS monitoring host [\#1](https://github.com/nubisproject/nubis-db-admin/pull/1) ([gozer](https://github.com/gozer))

diff --git a/nubis/builder/artifacts/v1.4.0/AMIs b/nubis/builder/artifacts/v1.4.0/AMIs
@@ -1,11 +1,11 @@
 amazon-ebs-amazon-linux:
-ap-northeast-1: ami-92e5aef5
-ap-northeast-2: ami-a802d2c6
-ap-southeast-1: ami-b474c5d7
-ap-southeast-2: ami-2c6a694f
-eu-central-1: ami-857cb6ea
-eu-west-1: ami-811d31e7
-sa-east-1: ami-d67d1bba
-us-east-1: ami-26b56730
-us-west-1: ami-7e2f711e
-us-west-2: ami-0ee96a6e
+ap-northeast-1: ami-3cf1a85b
+ap-northeast-2: ami-8930e3e7
+ap-southeast-1: ami-0c35886f
+ap-southeast-2: ami-fed3df9d
+eu-central-1: ami-0d885962
+eu-west-1: ami-fa98ab9c
+sa-east-1: ami-f5b2d299
+us-east-1: ami-7a62d16c
+us-west-1: ami-1d346f7d
+us-west-2: ami-22f77d42
diff --git a/nubis/builder/artifacts/v1.4.0/amazon-ebs-amazon-linux-packages.pp b/nubis/builder/artifacts/v1.4.0/amazon-ebs-amazon-linux-packages.pp
@@ -29,10 +29,10 @@
   ensure => '2.4.46-12.10.amzn1',
 }
 package { 'audit':
-  ensure => '2.4.1-5.27.amzn1',
+  ensure => '2.6.5-3.28.amzn1',
 }
 package { 'audit-libs':
-  ensure => '2.4.1-5.27.amzn1',
+  ensure => '2.6.5-3.28.amzn1',
 }
 package { 'augeas-libs':
   ensure => '1.0.0-5.7.amzn1',
@@ -101,7 +101,7 @@
   ensure => '1.4.4',
 }
 package { 'botocore':
-  ensure => '1.5.17',
+  ensure => '1.5.28',
 }
 package { 'bzip2':
   ensure => '1.0.6-8.12.amzn1',
@@ -188,7 +188,7 @@
   ensure => '0.5.5.1-4.5.amzn1',
 }
 package { 'datadog-agent':
-  ensure => '5.11.2-1',
+  ensure => '5.12.0-1',
 }
 package { 'db4':
   ensure => '4.7.25-18.11.amzn1',
@@ -218,19 +218,19 @@
   ensure => '2.33-6.6.amzn1',
 }
 package { 'device-mapper':
-  ensure => '1.02.93-3.26.amzn1',
+  ensure => '1.02.135-1.29.amzn1',
 }
 package { 'device-mapper-event':
-  ensure => '1.02.93-3.26.amzn1',
+  ensure => '1.02.135-1.29.amzn1',
 }
 package { 'device-mapper-event-libs':
-  ensure => '1.02.93-3.26.amzn1',
+  ensure => '1.02.135-1.29.amzn1',
 }
 package { 'device-mapper-libs':
-  ensure => '1.02.93-3.26.amzn1',
+  ensure => '1.02.135-1.29.amzn1',
 }
 package { 'device-mapper-persistent-data':
-  ensure => '0.3.2-1.7.amzn1',
+  ensure => '0.6.3-1.11.amzn1',
 }
 package { 'dhclient':
   ensure => '4.1.1-51.P1.26.amzn1',
@@ -476,13 +476,13 @@
   ensure => '1.15-11.4.amzn1',
 }
 package { 'kernel':
-  ensure => '4.4.41-36.55.amzn1',
+  ensure => '4.9.15-5.29.amzn1',
 }
 package { 'kernel-headers':
-  ensure => '4.4.44-39.55.amzn1',
+  ensure => '4.9.15-5.29.amzn1',
 }
 package { 'kernel-tools':
-  ensure => '4.4.44-39.55.amzn1',
+  ensure => '4.9.15-5.29.amzn1',
 }
 package { 'keyutils':
   ensure => '1.5.8-3.12.amzn1',
@@ -563,7 +563,7 @@
   ensure => '2.16-5.5.8.amzn1',
 }
 package { 'libcap-ng':
-  ensure => '0.7.3-5.13.amzn1',
+  ensure => '0.7.5-4.14.amzn1',
 }
 package { 'libcgroup':
   ensure => '0.40.rc1-5.11.amzn1',
@@ -713,10 +713,10 @@
   ensure => '5.1.4-4.1.9.amzn1',
 }
 package { 'lvm2':
-  ensure => '2.02.115-3.26.amzn1',
+  ensure => '2.02.166-1.29.amzn1',
 }
 package { 'lvm2-libs':
-  ensure => '2.02.115-3.26.amzn1',
+  ensure => '2.02.166-1.29.amzn1',
 }
 package { 'm4':
   ensure => '1.4.16-9.10.amzn1',
@@ -836,7 +836,7 @@
   ensure => '6.6.1p1-31.63.amzn1',
 }
 package { 'openssl':
-  ensure => '1.0.1k-15.96.amzn1',
+  ensure => '1.0.1k-15.99.amzn1',
 }
 package { 'p11-kit':
   ensure => '0.18.5-2.3.amzn1',
@@ -1103,7 +1103,7 @@
   ensure => '4.7.2-7.15.amzn1',
 }
 package { 'python27-crypto':
-  ensure => '2.6.1-1.12.amzn1',
+  ensure => '2.6.1-1.14.amzn1',
 }
 package { 'python27-daemon':
   ensure => '1.5.2-1.5.amzn1',
@@ -1196,7 +1196,7 @@
   ensure => '1.8.0-1.23.amzn1',
 }
 package { 'python27-urlgrabber':
-  ensure => '3.9.1-9.13.amzn1',
+  ensure => '3.10-8.16.amzn1',
 }
 package { 'python27-urllib3':
   ensure => '1.8.2-1.5.amzn1',
@@ -1238,16 +1238,16 @@
   ensure => '0.2.0-11.8.amzn1',
 }
 package { 'rpm':
-  ensure => '4.11.2-2.73.amzn1',
+  ensure => '4.11.3-21.75.amzn1',
 }
 package { 'rpm-build-libs':
-  ensure => '4.11.2-2.73.amzn1',
+  ensure => '4.11.3-21.75.amzn1',
 }
 package { 'rpm-libs':
-  ensure => '4.11.2-2.73.amzn1',
+  ensure => '4.11.3-21.75.amzn1',
 }
 package { 'rpm-python27':
-  ensure => '4.11.2-2.73.amzn1',
+  ensure => '4.11.3-21.75.amzn1',
 }
 package { 'rsa':
   ensure => '3.4.1',
@@ -1343,7 +1343,7 @@
   ensure => '2.1.0-7.10.amzn1',
 }
 package { 'system-release':
-  ensure => '2016.09-0.9',
+  ensure => '2017.03-0.0',
 }
 package { 'systemtap-sdt-devel':
   ensure => '3.0-2.33.amzn1',
@@ -1376,10 +1376,10 @@
   ensure => '3.0.9-32.1.5.amzn1',
 }
 package { 'tzdata':
-  ensure => '2016j-1.67.amzn1',
+  ensure => '2017a-1.68.amzn1',
 }
 package { 'tzdata-java':
-  ensure => '2016j-1.67.amzn1',
+  ensure => '2017a-1.68.amzn1',
 }
 package { 'udev':
   ensure => '173-4.13.amzn1',
@@ -1394,7 +1394,7 @@
   ensure => '0.6.5-13.3.13.amzn1',
 }
 package { 'urlgrabber':
-  ensure => '3.9.1',
+  ensure => '3.10',
 }
 package { 'urllib3':
   ensure => '1.8.2',
@@ -1445,19 +1445,19 @@
   ensure => '5.1.2-12alpha.12.amzn1',
 }
 package { 'yum':
-  ensure => '3.4.3-137.67.amzn1',
+  ensure => '3.4.3-150.68.amzn1',
 }
 package { 'yum-metadata-parser':
-  ensure => '1.1.4-8.12.amzn1',
+  ensure => '1.1.4-10.20.amzn1',
 }
 package { 'yum-plugin-priorities':
-  ensure => '1.1.31-34.28.amzn1',
+  ensure => '1.1.31-40.29.amzn1',
 }
 package { 'yum-plugin-upgrade-helper':
-  ensure => '1.1.31-34.28.amzn1',
+  ensure => '1.1.31-40.29.amzn1',
 }
 package { 'yum-utils':
-  ensure => '1.1.31-34.28.amzn1',
+  ensure => '1.1.31-40.29.amzn1',
 }
 package { 'zip':
   ensure => '3.0-1.10.amzn1',

diff --git a/nubis/puppet/datadog.pp → nubis/puppet/confd.pp b/nubis/puppet/datadog.pp → nubis/puppet/confd.pp
diff --git a/nubis/puppet/consul.pp b/nubis/puppet/consul.pp
@@ -0,0 +1,15 @@
+file { '/etc/consul/svc-db-admin.json':
+  ensure => present,
+  mode   => '0644',
+  owner  => 'root',
+  group  => 'root',
+  source => 'puppet:///nubis/files/consul-svc-db-admin.json',
+}
+
+file { '/etc/consul/svc-mysqld-exporter.json':
+  ensure => present,
+  mode   => '0644',
+  owner  => 'root',
+  group  => 'root',
+  source => 'puppet:///nubis/files/consul-svc-mysqld-exporter.json',
+}
diff --git a/nubis/puppet/files/confd/conf.d/datadog-mysql.toml b/nubis/puppet/files/confd/conf.d/datadog-mysql.toml
diff --git a/nubis/puppet/files/confd/conf.d/my.cnf.toml b/nubis/puppet/files/confd/conf.d/my.cnf.toml
@@ -8,5 +8,7 @@ gid = 0
 mode = "0640"
 
 keys = [
-    "/config"
+    "/config/Database"
 ]
+
+reload_cmd="/etc/init.d/mysqld_exporter restart"
diff --git a/nubis/puppet/files/confd/templates/datadog-mysql.tmpl b/nubis/puppet/files/confd/templates/datadog-mysql.tmpl
diff --git a/nubis/puppet/files/confd/templates/my.cnf.tmpl b/nubis/puppet/files/confd/templates/my.cnf.tmpl
@@ -1,4 +1,4 @@
 [client]
-host = {{ getv "/config/DBserver" }}
-user = {{ getv "/config/DBuser" }}
-password = {{ if exists "/config/DBpassword" }}{{ getv "/config/DBpassword" }}{{ else }}provisioner_password{{ end }}
+host = {{ getv "/config/Database/Server" }}
+user = {{ getv "/config/Database/User" }}
+password = {{ if exists "/config/Database/Password" }}{{ getv "/config/Database/Password" }}{{ else }}provisioner_password{{ end }}
diff --git a/nubis/puppet/files/consul-svc-db-admin.json b/nubis/puppet/files/consul-svc-db-admin.json
@@ -0,0 +1,11 @@
+{
+  "service": {
+    "check": {
+      "id": "db-admin",
+      "name": "Database Admin",
+      "script": "/bin/true",
+      "interval": "1h"
+    },
+    "name": "db-admin"
+  }
+}
diff --git a/nubis/puppet/files/consul-svc-mysqld-exporter.json b/nubis/puppet/files/consul-svc-mysqld-exporter.json
@@ -0,0 +1,12 @@
+{
+  "service": {
+    "name": "mysqld-exporter",
+    "port": 9104,
+    "check": {
+       "http": "http://localhost:9104/",
+       "interval": "10s",
+       "timeout": "1s"
+    }
+  }
+}
+