Skip to content

Fix support for SLES and add more logos#55

Open
mattiascockburn wants to merge 51 commits intoarioch:masterfrom
b1-systems:fixup
Open

Fix support for SLES and add more logos#55
mattiascockburn wants to merge 51 commits intoarioch:masterfrom
b1-systems:fixup

Conversation

@mattiascockburn
Copy link
Copy Markdown

@mattiascockburn mattiascockburn commented Jun 29, 2015

No description provided.

VuokkoVuorinnen and others added 30 commits March 20, 2015 12:06
@VuokkoVuorinnen
Update commands.cfg.erb
3a87257 
Fix a lookup error
@mattiasgiese-b1
provide default path attribute for execs
dfda8c5
@arioch
Increase exec lookup path
2645aa6
@mattiasgiese-b1
Add a simple definition for a generic-contact
8b0ddf3
@mattiasgiese-b1
Merge branch 'generic-contact'
4560883
@mattiasgiese-b1 @arioch
Add a simple definition for a generic-contact
09ed05a
@TimPollard @arioch
Making the warning and critical levels for check_total_procs configur…
a72e379 
…able

Conflicts:
	manifests/params.pp
	templates/redhat/nrpe_default.cfg.erb
@TimPollard @arioch
Changing the warning and critical level definitions for checktotalpro…
124022c 
…cs to match with checkload
@TimPollard @arioch
Redoing some of the stuff with making the check total procs plugin ha…
484b32e 
…ve configurable warning and critical levels.

Related to 06f029a & f5896c6

Conflicts:
	manifests/params.pp
@TimPollard @arioch
Making the args for checktotalprocs be set to their default of allow …
2d29d3c 
…args is off
@TimPollard @arioch
Fixing the check for the nrpe_allow_arguments in the nrpe commands list
33590e6
@arioch
logging of failed e-mail notifications
ee00d0c
@mattiasgiese-b1
adding missing fixture for spec tests
d066b3b
@mattiasgiese-b1
fixing permission problems on collected resources. every resource sho…
8b7fb3e 
…uld use th owner information of the base class
@mattiasgiese-b1
remove explicit dependency. resolves to undef, have to investigate fu…
abed89a 
…rther
@mattiasgiese-b1
Merge branch 'master' of https://github.com/arioch/puppet-icinga
7b28979
@mattiasgiese-b1
Add support for nrpe command prefix
09f36d3
@mattiasgiese-b1
add initial support for SLES
cf3afbc
@mattiasgiese-b1
strange indeed
7c163f4
@mattiasgiese-b1
strange indeed
6e1e707
@mattiasgiese-b1
refine os abstraction
cb886dd
@mattiasgiese-b1
Abstract client packages on SLES 11.3/12.0
b663a7d
@mattiasgiese-b1
Add service abstraction for SLES
c86fb2a
@mattiasgiese-b1
Abstraction was missing an }, my bad :-(
26fbe1e
@mattiasgiese-b1
Client support for SLES 11.3/12.0 refined
54471ee
@mattiasgiese-b1
Merge branch 'master' of https://github.com/arioch/puppet-icinga
921fa28
@mattiasgiese-b1 @arioch
Add a simple definition for a generic-contact
d529133
@mattiasgiese-b1 @arioch
adding missing fixture for spec tests
308af94
@mattiasgiese-b1 @arioch
fixing permission problems on collected resources. every resource sho…
d349412 
…uld use th owner information of the base class
@mattiasgiese-b1 @arioch
remove explicit dependency. resolves to undef, have to investigate fu…
77603b1 
…rther
TimPollard and others added 17 commits June 19, 2015 16:35
@TimPollard @arioch
Making the warning and critical levels for check_total_procs configur…
47acf5f 
…able

Conflicts:
	manifests/params.pp
	templates/redhat/nrpe_default.cfg.erb
@TimPollard @arioch
Changing the warning and critical level definitions for checktotalpro…
63987f3 
…cs to match with checkload
@TimPollard @arioch
Redoing some of the stuff with making the check total procs plugin ha…
fceceab 
…ve configurable warning and critical levels.

Related to 06f029a & f5896c6

Conflicts:
	manifests/params.pp
@TimPollard @arioch
Making the args for checktotalprocs be set to their default of allow …
9ed6e91 
…args is off
@TimPollard @arioch
Fixing the check for the nrpe_allow_arguments in the nrpe commands list
180fac3
@arioch
logging of failed e-mail notifications
b107aee
@mattiasgiese-b1 @arioch
Add support for nrpe command prefix
1e0df96
@mattiasgiese-b1 @arioch
add initial support for SLES
98610d1
@mattiasgiese-b1 @arioch
strange indeed
d9044f4
@arioch
Merge branch 'master' of github.com:Inuits/puppet-icinga
c1472e4
@mattiasgiese-b1
flupp
2d75d5a
@mattiasgiese-b1
Fixup SLES support in init.pp
2835baa
@mattiasgiese-b1
Adding logos for SLES/Ubuntu
714769f
@mattiasgiese-b1
Merge branch 'fixup'
15b65b7
@mattiasgiese-b1
Removed duplicate variable assignment
c572529
@mattiasgiese-b1
change client_user for RHEL based OSes
f66e432
@mattiasgiese-b1
force ipv4 for check-host-alive check
51f7821
@arioch
Copy link
Copy Markdown
Owner

arioch commented Jun 29, 2015

You forgot to run git pull before pushing those changes.
Could rebase that?

@mattiascockburn
Copy link
Copy Markdown
Author

mattiascockburn commented Jun 29, 2015

my bad. i will do that and create a new pr

@arioch
Copy link
Copy Markdown
Owner

arioch commented Jun 29, 2015

You can just git push origin +fixup to replace whatever is in this PR.
No need to create a new one.

@arioch arioch reopened this Jun 29, 2015
@mattiascockburn
Copy link
Copy Markdown
Author

mattiascockburn commented Jun 29, 2015

Whoops, please don't merge. Big fuckup happened

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mattiascockburn @arioch @VuokkoVuorinnen @mattiasgiese-b1 @TimPollard