Bump all role requirements to latest versions.

Author: geerlingguy

provisioning/requirements.yml

@@ -2,7 +2,7 @@
 - src: arknoll.selenium
   version: 1.3.0
 - src: franklinkim.newrelic
-  version: 1.2.0
+  version: 1.4.0
 - src: geerlingguy.adminer
   version: 1.1.0
 - src: geerlingguy.apache
@@ -18,9 +18,9 @@
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
-  version: 1.1.2
+  version: 1.1.3
 - src: geerlingguy.elasticsearch
-  version: 2.1.0
+  version: 2.1.1
 - src: geerlingguy.firewall
   version: 1.0.9
 - src: geerlingguy.git
@@ -34,7 +34,7 @@
 - src: geerlingguy.mysql
   version: 2.3.1
 - src: geerlingguy.nginx
-  version: 1.9.2
+  version: 1.9.3
 - src: geerlingguy.nodejs
   version: 3.2.0
 - src: geerlingguy.php
@@ -62,7 +62,7 @@
 - src: geerlingguy.ruby
   version: 2.3.1
 - src: geerlingguy.security
-  version: 1.2.0
+  version: 1.4.0
 - src: geerlingguy.solr
   version: 3.1.3
 - src: geerlingguy.varnish

provisioning/roles/franklinkim.newrelic/CHANGELOG.md

@@ -1,3 +1,29 @@
+<a name="1.4.0"></a>
+## 1.4.0 (2016-08-05)
+
+
+#### Features
+
+*   add label settings ([169d3867](https://github.com/weareinteractive/ansible-newrelic/commit/169d386710aba0d7d1397cb68ef7f8426d1fac80))
+
+
+
+<a name="1.3.0"></a>
+## 1.3.0 (2016-07-04)
+
+
+
+
+<a name="1.2.1"></a>
+### 1.2.1 (2016-04-10)
+
+
+#### Bug Fixes
+
+*   default groups breaks install when docker monitoring is enabled ([3e507b30](https://github.com/weareinteractive/ansible-newrelic/commit/3e507b3080fa8040a3659577f1bdc25c3d97508a))
+
+
+
 <a name="1.2.0"></a>
 ## 1.2.0 (2016-02-13)
 

provisioning/roles/franklinkim.newrelic/README.md

@@ -33,7 +33,7 @@ $ git clone https://github.com/weareinteractive/ansible-newrelic.git franklinkim
 
 ## Dependencies
 
-* Ansible >= 1.9
+* Ansible >= 2.0
 
 ## Variables
 
@@ -62,6 +62,10 @@ newrelic_disable_docker: yes
 newrelic_service_enabled: yes
 # current state: started, stopped
 newrelic_service_state: started
+# use default hostname, set a value to override the default hostname
+newrelic_override_hostname: ~
+# A series of label_type/label_value pairings: label_type:label_value
+newrelic_labels: ~
 
 ```
 
@@ -99,16 +103,17 @@ This is an example playbook:
 
 ```
 
+
 ## Testing
 
 ```shell
 $ git clone https://github.com/weareinteractive/ansible-newrelic.git
 $ cd ansible-newrelic
-$ vagrant up
+$ make test
 ```
 
 ## Contributing
-In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests and examples for any new or changed functionality.
+In lieu of a formal style guide, take care to maintain the existing coding style. Add unit tests and examples for any new or changed functionality.
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

provisioning/roles/franklinkim.newrelic/defaults/main.yml

@@ -20,3 +20,7 @@ newrelic_disable_docker: yes
 newrelic_service_enabled: yes
 # current state: started, stopped
 newrelic_service_state: started
+# use default hostname, set a value to override the default hostname
+newrelic_override_hostname: ~
+# A series of label_type/label_value pairings: label_type:label_value
+newrelic_labels: ~

provisioning/roles/franklinkim.newrelic/meta/main.yml

@@ -3,102 +3,140 @@ galaxy_info:
   author: franklin
   company: We Are Interactive
   description: Installs and configure newrelic
-  min_ansible_version: 1.9
+  min_ansible_version: 2.0
   license: MIT
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If travis integration is cofigured, only notification for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  github_branch: master
   #
   # Below are all platforms currently available. Just uncomment
   # the ones that apply to your role. If you don't see your
   # platform on this list, let us know and we'll get it added!
   #
   platforms:
-    - name: EL
-      versions:
-  #      - all
-  #      - 5
-  #      - 6
-        - 7
-  #  - name: GenericUNIX
-  #    versions:
-  #      - all
-  #      - any
-  #  - name: Fedora
-  #    versions:
-  #      - all
-  #      - 16
-  #      - 17
-  #      - 18
-  #      - 19
-  #      - 20
-  #  - name: opensuse
-  #    versions:
-  #      - all
-  #      - 12.1
-  #      - 12.2
-  #      - 12.3
-  #      - 13.1
-  #      - 13.2
-  #  - name: GenericBSD
-  #    versions:
-  #      - all
-  #      - any
-  #  - name: FreeBSD
-  #    versions:
-  #      - all
-  #      - 8.0
-  #      - 8.1
-  #      - 8.2
-  #      - 8.3
-  #      - 8.4
-  #      - 9.0
-  #      - 9.1
-  #      - 9.1
-  #      - 9.2
-    - name: Ubuntu
-      versions:
-        - all
-  #      - lucid
-  #      - maverick
-  #      - natty
-  #      - oneiric
-  #      - precise
-  #      - quantal
-  #      - raring
-  #      - saucy
-  #      - trusty
-  #  - name: SLES
-  #    versions:
-  #      - all
-  #      - 10SP3
-  #      - 10SP4
-  #      - 11
-  #      - 11SP1
-  #      - 11SP2
-  #      - 11SP3
-  #  - name: GenericLinux
-  #    versions:
-  #      - all
-  #      - any
-    - name: Debian
-      versions:
-        - all
-  #      - etch
-  #      - lenny
-  #      - squeeze
-  #      - wheezy
+  - name: EL
+    versions:
+    - all
+  #  - 5
+  #  - 6
+  #  - 7
+  #- name: GenericUNIX
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Solaris
+  #  versions:
+  #  - all
+  #  - 10
+  #  - 11.0
+  #  - 11.1
+  #  - 11.2
+  #  - 11.3
+  #- name: Fedora
+  #  versions:
+  #  - all
+  #  - 16
+  #  - 17
+  #  - 18
+  #  - 19
+  #  - 20
+  #  - 21
+  #  - 22
+  #  - 23
+  #- name: Windows
+  #  versions:
+  #  - all
+  #  - 2012R2
+  #- name: SmartOS
+  #  versions:
+  #  - all
+  #  - any
+  #- name: opensuse
+  #  versions:
+  #  - all
+  #  - 12.1
+  #  - 12.2
+  #  - 12.3
+  #  - 13.1
+  #  - 13.2
+  #- name: Amazon
+  #  versions:
+  #  - all
+  #  - 2013.03
+  #  - 2013.09
+  #- name: GenericBSD
+  #  versions:
+  #  - all
+  #  - any
+  #- name: FreeBSD
+  #  versions:
+  #  - all
+  #  - 10.0
+  #  - 10.1
+  #  - 10.2
+  #  - 8.0
+  #  - 8.1
+  #  - 8.2
+  #  - 8.3
+  #  - 8.4
+  #  - 9.0
+  #  - 9.1
+  #  - 9.1
+  #  - 9.2
+  #  - 9.3
+  - name: Ubuntu
+    versions:
+    - all
+  #  - lucid
+  #  - maverick
+  #  - natty
+  #  - oneiric
+  #  - precise
+  #  - quantal
+  #  - raring
+  #  - saucy
+  #  - trusty
+  #  - utopic
+  #  - vivid
+  #  - wily
+  #- name: SLES
+  #  versions:
+  #  - all
+  #  - 10SP3
+  #  - 10SP4
+  #  - 11
+  #  - 11SP1
+  #  - 11SP2
+  #  - 11SP3
+  #- name: GenericLinux
+  #  versions:
+  #  - all
+  #  - any
+  - name: Debian
+    versions:
+    - all
+  #  - etch
+  #  - jessie
+  #  - lenny
+  #  - squeeze
+  #  - wheezy  categories:
   #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  # The number of tags imported by Galaxy is limited to 20,
-  # and tag values containing non-alphanumeric characters will be ignored.
-  # Tag values containing a : will be split into multiple tags.
-  # The tag cloud:ec2, for example, will become two tags: cloud and ec2.
+  # List tags for your role here, one per line. A tag is
+  # a keyword that describes and categorizes the role.
+  # Users find roles by searching for tags. Be sure to
+  # remove the '[]' above if you add tags to this list.
   #
+  # NOTE: A tag is limited to a single word comprised of
+  # alphanumeric characters. Maximum 20 tags per role.
   galaxy_tags:
     - monitoring
     - newrelic
+# List your role dependencies here, one per line. Only
+# dependencies available via galaxy should be listed here.
+# Be sure to remove the '[]' above if you add dependencies
+# to this list.
 dependencies: []
-  # List your role dependencies here, one per line. Only
-  # dependencies available via galaxy should be listed here.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.

provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2

@@ -187,6 +187,9 @@ logfile={{ newrelic_logfile }}
 # Default: none
 #
 #labels=label_type:label_value
+{% if newrelic_labels %}
+labels={{ newrelic_labels }}
+{% endif %}
 
 #
 # Option : disable_nfs
@@ -203,3 +206,14 @@ disable_nfs={{ newrelic_disable_nfs | to_nice_json }}
 # Default: false
 #
 disable_docker={{ newrelic_disable_docker | to_nice_json }}
+
+#
+# Option : override_hostname
+# Type   : string
+# Value  : Set to a non-empty value to use as the hostname that will be reported to New Relic
+# Default: none
+#
+#hostname=newrelic.com
+{% if newrelic_override_hostname %}
+hostname={{ newrelic_override_hostname }}
+{% endif %}