Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 50 commits into from May 6, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
a35a42a
First stab at recipe-based configuration.
alq666 Jan 30, 2013
c96a2d1
Include the recipe to only have to say recipe[datadog::cassandra]
alq666 Jan 30, 2013
5df0e3f
Updated the version number
alq666 Jan 30, 2013
4d01a7f
Update README.md
alq666 Jan 30, 2013
f2422bb
Taking another, simpler approach.
alq666 Feb 10, 2013
df9a37f
Work in progress
alq666 Feb 11, 2013
66721fa
Merge branch 'master' into integration-recipes
alq666 Mar 6, 2013
47d9ee0
Merge branch 'integration-recipes' of github.com:DataDog/chef-datadog…
alq666 Mar 6, 2013
bb445ea
Added mysql, replace ambiguous monitor name with ddmonitor
Mar 8, 2013
29d9173
Postgres passes.
Mar 8, 2013
279b675
More integrations converted to the new style
alq666 Mar 9, 2013
000fd38
Merge branch 'master' into integration-recipes
alq666 Mar 9, 2013
81263b7
Moving to arguments that can be passed to the monitor.
alq666 Mar 13, 2013
f111ee9
Enough scaffolding to test new-style integrations
alq666 Apr 24, 2013
a0235a8
Add new agent configuration templates
alq666 Apr 24, 2013
c28cc65
Add activemq, apache, cassandra to the list.
alq666 Apr 24, 2013
e7501da
Add couchdb, elasticsearch, haproxy.
alq666 Apr 24, 2013
f02fcc2
Updated readme
alq666 Apr 5, 2013
b2f2646
List does not exist, Array does.
alq666 Apr 29, 2013
84bf596
Tested cassandra and couchdb.
alq666 Apr 29, 2013
d5c0b6b
More recipes in with a crude vagrant pass.
alq666 Apr 29, 2013
6c2cfb0
Merge master onto integration-recipes to not fall behind
alq666 Apr 29, 2013
e4b77ff
A few more integrations in
alq666 Apr 30, 2013
21f8f5d
style update
miketheman Apr 30, 2013
b9810d5
Merge branch 'master' into integration-recipes
miketheman Apr 30, 2013
073423b
Reverts Berksfile change to support local cookbook integration
miketheman Apr 30, 2013
fdcef13
updates syslog configuration attributes and templates
miketheman May 1, 2013
eaee81e
some template fixin'
miketheman May 1, 2013
fb19fc7
removing unreferenced cassandra file
miketheman May 1, 2013
8a5f314
moves logging to debug, updates notification syntax
miketheman May 1, 2013
415956c
use platform_family attribute for platform selection
miketheman May 1, 2013
fe8f126
updates test kitchen for modern boxes
miketheman May 1, 2013
68392be
adds more instances to local Vagrant development, and adds debug leve…
miketheman May 2, 2013
20eb5ad
renames ddmonitor resource/provider to monitor
miketheman May 2, 2013
1770ec2
updates inline documentation
miketheman May 2, 2013
3de0416
more inline cookbook documentation
miketheman May 2, 2013
6ba7b71
updates datadog::apache recipe
miketheman May 2, 2013
60827a3
updates datadog::mysql recipe
miketheman May 2, 2013
cfe9ac9
updates datadog::nginx recipe
miketheman May 3, 2013
b1208b5
ddmonitor -> monitor + redis
alq666 May 4, 2013
e8159cc
redis and postgres compile and converge
alq666 May 4, 2013
d006dec
Tomcat is in
alq666 May 5, 2013
f9010ae
Riak converges
alq666 May 5, 2013
933b186
Varnish recipe
alq666 May 5, 2013
fd37233
JMX is in
alq666 May 5, 2013
4916c82
Added jmx testing
alq666 May 5, 2013
4a8c339
renames redis.rb to redisdb.rb for consistency
miketheman May 6, 2013
bd18001
updates Rakefile for berkshelf cleanup
miketheman May 6, 2013
2b1a239
forgot to rename the attribute elsewhere
miketheman May 6, 2013
8c73626
updates readme and changelog
miketheman May 6, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -29,5 +29,6 @@ Gemfile*.lock
# Berkshelf
Berksfile.lock
cookbooks/
/.ruby-version
.kitchen/
.kitchen.local.yml
60 changes: 42 additions & 18 deletions .kitchen.yml
Expand Up @@ -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
81 changes: 81 additions & 0 deletions 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
2 changes: 1 addition & 1 deletion 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.
Expand Down