Update gmetad.conf and add custom RRAs #22

NoodlesNZ · 2014-10-24T00:49:40Z

I have updated gmetad.conf from the ganglia repo and added custom RRAs with default params. I have also changed the gmetad.conf template to remove el6 from the filename (as it's used as a common template across all supported OSes)

jhoblitt · 2014-10-24T00:53:42Z

templates/gmetad.conf.erb

@@ -101,8 +113,12 @@ gridname "<%= @gridname %>"
 #-------------------------------------------------------------------------------
 # User gmetad will setuid to (defaults to "nobody")
 # default: "nobody"
-setuid_username "<%= @gmetad_user %>"


I'm guessing that was accidental?

The default gmetad.conf doesn't have this set. I'll add it back in for debian support though.

jhoblitt · 2014-10-24T00:56:15Z

manifests/gmetad.pp

@@ -48,6 +48,7 @@
 class ganglia::gmetad(
  $clusters = [ { 'name' => 'my cluster', 'address' => 'localhost' } ],
  $gridname = undef,
+  $rras = $ganglia::params::rras,


It should be nice if this was validated as an array.

Was unsure how to do that, but yes I agree it should be validated. Will look into it

jhoblitt · 2014-10-24T00:58:04Z

Thank you for working on this!

By any chance did you test with the epel5 version? el5 may need to get it's own templates.

Any docs you could add the readme for this new feature would be helpful.

NoodlesNZ · 2014-10-24T01:04:38Z

I haven't got a rhel5 box to play with unfortunately. Is el5 still being actively used with el6 and el7?

NoodlesNZ · 2014-10-24T01:14:20Z

Have added some documentation on the RRAs

NoodlesNZ · 2014-10-24T01:21:52Z

Ok, this should be ready to go apart from the array validation. What's the best way to go about that? Should I just copy the example in ganglia_validate_clusters.rb?

…r and integer respectively. This makes it easier to validate

NoodlesNZ · 2014-10-24T03:28:40Z

Sorry, had some issues with Ruby. Can you review and see if I've done everything correctly? I can see the validation working on my local puppet.

NoodlesNZ · 2014-10-28T01:57:43Z

@jhoblitt is there anything else that needs to be to done to merge this?

jhoblitt · 2014-10-28T16:32:26Z

@NoodlesNZ It looks good skimming through it. I just need to give it a try myself (and sadly I've been swamped).

jhoblitt · 2014-11-02T23:19:26Z

I haven't forgotten about this -- I needed to get the acceptance tests back into a working state, which I just merged in PR #23.

jhoblitt · 2014-11-02T23:34:44Z

I rebased this PR on the current master (one line manifests/params.pp needs to be removed after the merge) and the acceptance tests pass on debian but fail on el6.

Passes:

BEAKER_set=debian-73-x64 ber beaker

Fails:

BEAKER_set=centos-64-x64 ber beaker

with

Failures:

  1) ganglia::gmetad class running puppet code applies the manifest twice with no stderr
     Failure/Error: apply_manifest(pp, :catch_failures => true)
     Beaker::Host::CommandFailure:
       Host 'centos-64-x64' exited with 6 running:
         env PATH="/usr/bin:/opt/puppet-git-repos/hiera/bin:${PATH}" RUBYLIB="/opt/puppet-git-repos/hiera/lib:/opt/puppet-git-repos/hiera-puppet/lib:${RUBYLIB}" puppet apply --verbose --detailed-exitcodes /tmp/apply_manifest.pp.g4lSNF  
       Last 10 lines of output were:

        [FAILED]
        Error: /Stage[main]/Ganglia::Gmetad::Service/Service[gmetad]/ensure: change from stopped to running failed: Could not start Service[gmetad]: Execution of '/sbin/service gmetad start' returned 1: Starting GANGLIA gmetad: gmetad config file error: Missing argument to option 'case_sensitive_hostnames'

        [FAILED]
        Notice: /Stage[main]/Ganglia::Gmetad::Service/Service[gmetad]: Triggered 'refresh' from 1 events
        Notice: /Stage[main]/Ganglia::Gmetad/Anchor[ganglia::gmetad::end]: Dependency Service[gmetad] has failures: true
        Warning: /Stage[main]/Ganglia::Gmetad/Anchor[ganglia::gmetad::end]: Skipping because of failed dependencies
        Info: Creating state file /var/lib/puppet/state/state.yaml
        Notice: Finished catalog run in 51.28 seconds
     # ./spec/acceptance/gmetad_spec.rb:22:in `block (3 levels) in <top (required)>'

  2) ganglia::gmetad class Service "gmetad" should be running
     Failure/Error: it { should be_running }
       expected Service "gmetad" to be running
     # ./spec/acceptance/gmetad_spec.rb:32:in `block (3 levels) in <top (required)>'

  3) ganglia::gmetad class Service "gmetad" should be enabled
     Failure/Error: it { should be_enabled }
       expected Service "gmetad" to be enabled
     # ./spec/acceptance/gmetad_spec.rb:33:in `block (3 levels) in <top (required)>'

Are you willing to take a look?

NoodlesNZ · 2014-11-02T23:45:23Z

I'll take a look

…nto jhoblitt-master

NoodlesNZ · 2014-11-02T23:56:08Z

Sorry, missed adding case_sensitive_hostnames to one of the cases. Should be fine now.

jhoblitt · 2014-11-03T03:25:16Z

Great - thank you! I'm going to merge this. Let me know if want to take a stab at writing unit tests for ganglia_validate_rras() as a seperate PR or if I should take care of it when I have a chance.

NoodlesNZ · 2014-11-03T03:27:51Z

I'll give it a go. I've never used ruby unit tests before, but I'll try and follow ones that you've already done.

jhoblitt · 2014-11-03T03:30:15Z

Let me know if you need any help. Rspec is easy to work with but it can
take a while to get your head around some of the magic it does behind
the scenes.

Update gmetad.conf and add custom RRAs

jhoblitt · 2014-11-03T03:32:48Z

That was weird -- GH closed the PR without merging it...

NoodlesNZ added 6 commits October 24, 2014 13:16

Added custom RRAs to gmetad and updated gmetad.conf from ganglia repo

e5cebcf

Changed name of gmetad template

ef80fb6

Trying to use params defaults for rras

61cdc03

Changed gmetad template to gmetad.conf.erb

4bcbfdd

Use default rras for gmetad

07e8425

Fixed RRAs format

32b2c66

jhoblitt reviewed Oct 24, 2014
View reviewed changes

Fixed whitespace issue on params.pp

9a10187

jhoblitt reviewed Oct 24, 2014
View reviewed changes

NoodlesNZ added 2 commits October 24, 2014 13:59

Re-added setuid_username

af4338d

Added gmeta_case_sensitive_hostnames

d82d139

Added documentation on RRAs

c892fd0

NoodlesNZ added 2 commits October 24, 2014 14:18

Fixed markdown

e935413

Fixed grammar

b23f94f

NoodlesNZ added 6 commits October 24, 2014 14:50

Initial work for ganglia_validate_rras()

48f9c24

Changed xff, steps and rows params in gmetad to float/integer, intege…

8622e51

…r and integer respectively. This makes it easier to validate

Added validation for cf

0066ecf

Added validation function into class

1c241e2

Fixed validation for xff

aee3385

Fixed validation issues

3c1997e

NoodlesNZ added 3 commits November 3, 2014 12:50

Merge branch 'master' of https://github.com/jhoblitt/puppet-ganglia i…

6cdb4ca

…nto jhoblitt-master

Merge branch 'jhoblitt-master'

d722950

Fixed el6 case_sensitive_hostnames

23ca842

Fixed gmetad_service_erb variable problem

4cf6433

jhoblitt closed this Nov 3, 2014

jhoblitt reopened this Nov 3, 2014

jhoblitt pushed a commit that referenced this pull request Nov 3, 2014

Merge pull request #22 from NoodlesNZ/master

67db493

Update gmetad.conf and add custom RRAs

jhoblitt merged commit 67db493 into jhoblitt:master Nov 3, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update gmetad.conf and add custom RRAs #22

Update gmetad.conf and add custom RRAs #22

NoodlesNZ commented Oct 24, 2014

jhoblitt Oct 24, 2014

NoodlesNZ Oct 24, 2014

jhoblitt Oct 24, 2014

NoodlesNZ Oct 24, 2014

jhoblitt commented Oct 24, 2014

NoodlesNZ commented Oct 24, 2014

NoodlesNZ commented Oct 24, 2014

NoodlesNZ commented Oct 24, 2014

NoodlesNZ commented Oct 24, 2014

NoodlesNZ commented Oct 28, 2014

jhoblitt commented Oct 28, 2014

jhoblitt commented Nov 2, 2014

jhoblitt commented Nov 2, 2014

NoodlesNZ commented Nov 2, 2014

NoodlesNZ commented Nov 2, 2014

jhoblitt commented Nov 3, 2014

NoodlesNZ commented Nov 3, 2014

jhoblitt commented Nov 3, 2014

jhoblitt commented Nov 3, 2014

Update gmetad.conf and add custom RRAs #22

Update gmetad.conf and add custom RRAs #22

Conversation

NoodlesNZ commented Oct 24, 2014

jhoblitt Oct 24, 2014

Choose a reason for hiding this comment

NoodlesNZ Oct 24, 2014

Choose a reason for hiding this comment

jhoblitt Oct 24, 2014

Choose a reason for hiding this comment

NoodlesNZ Oct 24, 2014

Choose a reason for hiding this comment

jhoblitt commented Oct 24, 2014

NoodlesNZ commented Oct 24, 2014

NoodlesNZ commented Oct 24, 2014

NoodlesNZ commented Oct 24, 2014

NoodlesNZ commented Oct 24, 2014

NoodlesNZ commented Oct 28, 2014

jhoblitt commented Oct 28, 2014

jhoblitt commented Nov 2, 2014

jhoblitt commented Nov 2, 2014

NoodlesNZ commented Nov 2, 2014

NoodlesNZ commented Nov 2, 2014

jhoblitt commented Nov 3, 2014

NoodlesNZ commented Nov 3, 2014

jhoblitt commented Nov 3, 2014

jhoblitt commented Nov 3, 2014