Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Tweaks to event copy.

  • Loading branch information...
commit 012df08867fb2721b5e59b5c5fd984ad7e0bb4ae 1 parent a5fc6c9
@alq666 alq666 authored
Showing with 14 additions and 11 deletions.
  1. +2 −2 Modulefile
  2. +10 −7 README.md
  3. +2 −2 lib/puppet/reports/datadog_reports.rb
View
4 Modulefile
@@ -1,7 +1,7 @@
name 'DataDog/puppet-datadog-agent'
-version '0.0.1'
+version '0.0.2'
license 'Apache License, Version 2.0'
author 'James Turnbull (<james@lovedthanlost.net>) and Rob Terhaar (<rob@atlanticdynamic>) for Datadog Inc.'
-summary "Install the Datadog monitoring agent"
+summary "Install the Datadog monitoring agent and report Puppet runs to Datadog"
description "This will install the Datadog monitoring agent. Sign up and get your API key at: http://www.datadoghq.com/ "
project_page "https://github.com/DataDog/puppet-datadog-agent"
View
17 README.md
@@ -14,10 +14,10 @@ Requirements
* A Datadog account and API Key
On your Puppet master:
+
* `dogapi` gem (v 1.0.3 and later)
* `ruby-dev` headers, required to build dogapi gem
-
Installation
------------
@@ -28,8 +28,8 @@ path. Remember to rename the directory to `datadog` from
Usage
-----
-1. Update the default class parameters with your API key (and confirm the
- DataDog URL is correct in datadog::params).
+1. Update the default class parameters with your [API key](https://app.datadoghq.com/account/settings#api)
+ (and confirm the DataDog URL is correct in datadog::params).
2. Specify the module on any nodes you wish to install the DataDog
Agent.
@@ -37,12 +37,14 @@ Usage
include datadog
Or assign this module using the Puppet 2.6 style Parameterized class:
- class {'datadog':
+
+ class { 'datadog':
api_key => "yourkey",
}
On your Puppet master, enable reporting:
- class {'datadog':
+
+ class { 'datadog':
api_key => "yourkey",
puppet_run_reports = true,
}
@@ -67,13 +69,14 @@ Usage
And on all of your Puppet client nodes add:
+
[agent]
...
report=true
-Author
-------
+Authors
+-------
James Turnbull <james@lovedthanlost.net>
Alexis Lê-Quôc <alq@datadoghq.com>
View
4 lib/puppet/reports/datadog_reports.rb
@@ -77,9 +77,9 @@ def process
failed_resources = self.resource_statuses.values.find_all {|s| s.failed }
# Little insert if we know the config
- config_version_blurb = if defined?(self.configuration_version) then "applied version #{self.configuration_version}" else "" end
+ config_version_blurb = if defined?(self.configuration_version) then "applied version #{self.configuration_version} and" else "" end
- event_data << "Puppet #{config_version_blurb}changed #{pluralize(changed_resources.length, 'resources')} out of #{total_resource_count}."
+ event_data << "Puppet #{config_version_blurb} changed #{pluralize(changed_resources.length, 'resources')} out of #{total_resource_count}."
# List changed resources
if changed_resources.length > 0
Please sign in to comment.
Something went wrong with that request. Please try again.