Merge pull request #43 from DataDog/integration-recipes

Release 1.0.0 with integration recipes (was: First stab at recipe-based configuration.)

.gitignore

@@ -29,5 +29,6 @@ Gemfile*.lock
 # Berkshelf
 Berksfile.lock
 cookbooks/
+/.ruby-version
 .kitchen/
 .kitchen.local.yml

.kitchen.yml

@@ -2,34 +2,58 @@
 driver_plugin: vagrant
 
 platforms:
-- name: ubuntu-12.04
+- name: ubuntu-12.04_chef_11.4.4
+  driver_config:
+    box: opscode_ubuntu-12.04_chef-11.4.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box
+    require_chef_omnibus: 11.4.4
+- name: ubuntu-12.04_chef_10.24.4
   driver_config:
     box: canonical-ubuntu-12.04
     box_url: http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box
-    require_chef_omnibus: true
-- name: ubuntu-10.04
+    require_chef_omnibus: 10.24.4
+- name: ubuntu-10.04_chef_11.4.4
+  driver_config:
+    box: opscode_ubuntu-10.04_chef-11.4.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.4.box
+    require_chef_omnibus: 11.4.4
+- name: ubuntu-10.04_chef_10.24.4
+  driver_config:
+    box: opscode_ubuntu-10.04_chef-11.4.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.4.4.box
+    require_chef_omnibus: 10.24.4
+
+- name: centos-6.4_chef_11.4.4
+  driver_config:
+    box: opscode-centos-6.4_chef_11.4.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.4.box
+    require_chef_omnibus: 11.4.4
+- name: centos-6.4_chef_10.24.4
   driver_config:
-    box: opscode-ubuntu-10.04
-    box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box
-    # require_chef_omnibus: 10.24.0
-- name: centos-6.3
+    box: opscode-centos-6.4_chef_11.4.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.4.box
+    require_chef_omnibus: 10.24.4
+- name: centos-5.9_chef_11.4.4
   driver_config:
-    box: opscode-centos-6.3
-    box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box
-- name: centos-5.8
+    box: opscode-centos-5.9_chef-11.4.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.4.box
+    require_chef_omnibus: 11.4.4
+- name: centos-5.8_chef_10.24.4
   driver_config:
-    box: opscode-centos-5.8
-    box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box
+    box: opscode-centos-5.9_chef-11.4.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_chef-11.4.4.box
+    require_chef_omnibus: 10.24.4
 
 suites:
-- name: default
-  run_list: ["recipe[datadog::default]"]
-  attributes: {}
-  # This should actually do nothing.
-  # There is a sanity.bats test to simply verify that /tmp exists.
+# - name: default
+#   run_list: ["recipe[datadog::default]"]
+#   attributes: {}
+#   # This should actually do nothing.
+#   # There is a sanity.bats test to simply verify that /tmp exists.
 
 - name: dd-agent
-  run_list: ["recipe[datadog::dd-agent]"]
+  run_list: ["recipe[datadog::dd-handler]", "recipe[datadog::dd-agent]"]
   attributes:
     datadog:
       api_key: somethingnotnil
+      application_key: alsonotnil

CHANGELOG.md

@@ -0,0 +1,81 @@
+Changes
+=======
+
+# v1.0.0 - 2013/05/06
+
+* **BREAKING CHANGE**: Moved all attributes into `datadog` namespace - #46 (#23, #26)
+
+  Reasoning behind this was that originally we attempted to auto-detect many common attributes and deploy automatic monitoring for them.
+  We found that since inclusion of the `datadog` cookbook early in the run list caused the compile phase to be populated with our defaults (mostly `nil`), instead of the desired target, and namespacing of the attributes became necessary.
+
+* **NEW PROVIDER**: Added a new `datadog_monitor` provider for integration use
+
+  The new provider is used in many pre-provided integration recipes, such as `datadog::apache`.
+  This enables a run list to include this recipe, as well as populate a node attribute with the needed instance details to monitor the given service
+
+* Updated dependencies in Gemfile, simplifies travis build - #34, #55
+* Much improved test system (chefspec, test-kitchen) - #35 & others
+* Tests against multiple versions of Chef - #18
+* Added language-specific recipes for installing `dogstatsd` - (#28)
+* Added ability to control `dogstatsd` from agent config via attribute - #27
+* Placed the `dogstatsd` log file in `/var/log/` instead of `/tmp`
+* Added attribute to configure dogstreams in `datadog.conf` - #37
+* Updated for `platform_family` semantics
+* Added `node['datadog']['agent_version']` attribute
+* (Handler Recipe) Better handling of EC2 instance ID for Handler - #44
+* Updated for agent 3.6.x logging syntax
+* Generated config file removes some whitespace - #56
+* Removed dependency on `yum::epel`, only uses `yum` for the `repository` recipe
+
+
+## v0.1.4
+* Quick fix for backporting test code to support upload in ruby 1.8.7
+
+## v0.1.3
+* Work-around for COOK-2171
+
+## v0.1.2
+* Fixed typo in jmx section
+
+## v0.1.1
+* Added support for postgres, redis & memcached
+* `dd-agent` - updated to include more platforms
+* `dd-handler` - updated to leverage `chef_gem` resource if available
+* Updated copyright for 2012
+* Updated syntax for node attribute accessors
+* Some syntax styling fixes
+* Added agent logging configuration
+* Removed extraneous dependencies
+* Added automated testing suite
+
+## v0.0.12
+* Updated for CentOS dependencies
+
+## v0.0.11
+* Link to github repository.
+
+## v0.0.10
+* `dd-handler` - Corrects attribute name.
+
+## v0.0.9
+* `dd-agent` - Adds an explicit varnish attribute.
+
+## v0.0.8
+* `dd-agent` - Add varnish support.
+
+## v0.0.7
+* `dd-agent` - default to using instance IDs as hostnames when running dd-agent on EC2
+
+## v0.0.5
+* `dd-agent` - Full datadog.conf template using attributes (thanks @drewrothstein)
+
+## v0.0.4
+* `dd-agent` - Added support for Nagios PerfData and Graphite.
+
+## v0.0.3
+* `dd-agent` - Added support for RPM installs - Red Hat, CentOS, Scientific, Fedora
+
+## v0.0.2
+* Initial refactoring, including the `dd-agent` cookbook here
+* Adding chef-handler-datadog to report to the newsfeed
+* Added ruby-dev dependency

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Datadog, Inc.
+Copyright 2012, 2013 Datadog, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.