Merge branch 'dev'

.travis.yml

@@ -1,27 +1,20 @@
 sudo: required
-
 language: generic
-
 services:
-  - docker
-
+- docker
 script:
-  - docker build -t netuitive/docker-agent .;
-    cd testing;
-
-    ./test.sh;
-
-    for f in testserver.pass; do
-        [ -e "$f" ] && echo "artifact $f exists" || exit 1;
-        break;
-    done
-
-    cd ..;
-
+- |-
+  docker build -t netuitive/docker-agent .; cd testing;
+  ./test.sh;
+  for f in testserver.pass; do [ -e "$f" ] && echo "artifact $f exists" || exit 1; break; done
+  cd ..;
 deploy:
   provider: script
   skip_cleanup: true
   script: chmod +x $TRAVIS_BUILD_DIR/docker-deploy.sh && sh $TRAVIS_BUILD_DIR/docker-deploy.sh
   on:
     tags: true
     repo: Netuitive/docker-agent
+notifications:
+  slack:
+    secure: zwlZY2nEPWSSZ5KnGefUV5bPuhlFfILTf64Qt+zgenULWdH04V4zKc8LTlyGtnanczYAjwtR4T/gT2+GVWkV9pku6Zwz7sxo2hc0u8gDiS+giHWCLTTKJB/LxCTSqi21AGbpuHqLfGMldwPzr9roZyjnTvcsWvk2fvO5io0oKoybxBUhZYdJ1zWi6nXRMDw+pPYp5DjUANf+Ko++/iYxqZiqPa/MmBsPZQbuM9m2ilJqsRU6PAj0Gtj+7MN7v10aDoVVBTxeWwCpd4/h8R4ii7IPqwcJR1qFE8MR3kYtocPyJ5PfcB3xu4i2/DyQlGWWWtt1IBjUqpNMPK5HyzyoLAxS+XMrsrkyy3y5w6dAjzqV2rp4tYYDlBPCpvGV7cbbG8n7XQSYh8H8aiECj9ZGvtHhc98tHTDZxtKz5q1xbyJ9iMSsB7e/r3GrehFBOWsL+xOAk2YpbowG/0OjKmYoSLaCpilidPmi3MCboz7tNbcDDZczs4DEhQX/CINBv1uIVtcHPsBxg+n/5bOkxeybFML79ox8g8hNnOaHHJjWjELwXeDPBWyGDuZ2hh0BLhXudycmgbqnmDvMWuxaBU9DWuug500p06vbh00EIVB2Ri5tqEoF3etaYMG9Rx3m4CFTZ6MPPjQ7jGS0NF7RbXzqXOratRszln/blQqnjYFFaL8=

Dockerfile

@@ -1,4 +1,4 @@
-# VERSION               0.2.11
+# VERSION               0.2.12
 # DESCRIPTION:    Netuitive-agent in a container
 # MAINTAINER Netuitive <[email protected]>
 
@@ -21,7 +21,7 @@ ENV TAGS ""
 RUN  yum -y update \
   && rpm --import https://repos.app.netuitive.com/RPM-GPG-KEY-netuitive \
   && rpm -ivh https://repos.app.netuitive.com/rpm/noarch/netuitive-repo-1-0.2.noarch.rpm \
-  && yum -y install netuitive-agent-0.6.6-167.el6 \
+  && yum -y install netuitive-agent-0.6.7-169.el6 \
   && /sbin/chkconfig netuitive-agent off \
   && yum clean all \
   && find /opt/netuitive-agent/collectors/ -type f -name "*.py" -print0 | xargs -0 sed -i 's/\/proc/\/host_proc/g' \

HISTORY.md

@@ -1,6 +1,12 @@
 Netuitive Docker Agent Release History
 ======================================
 
+Version 0.2.12
+---------------------------
+- Update netuitive-agent.conf to be in line with upstream defaults.
+- Add build notifications
+- Update netuitive-agent to v0.6.7
+
 Version 0.2.11
 ---------------------------
 - pull linux agent 0.6.6 for various bug fixes including a slow memory leak

netuitive-agent.conf

@@ -22,6 +22,7 @@ pid_file = /opt/netuitive-agent/netuitive-agent.pid
 
 # Directory to load collector modules from
 collectors_path = /opt/netuitive-agent/collectors/
+
 # Directory to load collector configs from
 collectors_config_path = /opt/netuitive-agent/conf/collectors/
 
@@ -47,9 +48,12 @@ keys = rotated_file
 ### Netuitive URL to post the metrics
 url = https://api.app.netuitive.com/ingest/infrastructure
 
-### Netuitive Datasource api key
+### Metricly Datasource api key
 api_key = apikey
 
+### Metricly Cloud HTTP Connection Timeout
+connection_timeout = 5
+
 ### Uncomment to add tags
 # tags = tag1:tag1val, tag2:tag2val
 
@@ -62,6 +66,10 @@ max_backlog_multiplier = 5
 # Trim down how many batches
 trim_backlog_multiplier = 4
 
+# Write metric fqns to a local file.
+write_metric_fqns = False
+metric_fqns_path = /opt/netuitive-agent/log/metric_fqns.txt
+
 # local statsd server
 [[[statsd]]]
 enabled = True
@@ -123,6 +131,9 @@ splay = 1
 method = threading
 simple = True
 
+[[BaseCollector]]
+enabled = False
+
 [[CPUCollector]]
 enabled = True
 simple = False