staging-diff.txt

commit e244234a7f5cadaf885712b52f1e6eaf1231f734
Merge: 90011cd c0ceebe
Author: Tom Bamford <[email protected]>
Date:   Wed Dec 7 11:53:37 2016 +0000

    Merged in tom-nfs-fix (pull request #8)
    
    NFS module fix

commit c0ceebee14b2bc8bdbdb81ab03efa07a25086c2a
Author: Tom Bamford <[email protected]>
Date:   Wed Dec 7 08:03:49 2016 +0000

    Fix nfs module error "no init script/upstart config for nfs-lock" as per https://github.com/derdanne/puppet-nfs/pull/12/files

commit 90011cdd72f517dab823f600e2bb831affb72e3f
Merge: 79bc711 a964895
Author: JP Viljoen <[email protected]>
Date:   Tue Dec 6 14:00:59 2016 +0000

    Merged in feature/add-java-ks-forgemodule (pull request #7)
    
    [forgemodules] java_ks for use by keystore module

commit 79bc71195125205bad2dc512e9d6641eaad25e91
Author: Pieter Steyn <[email protected]>
Date:   Tue Dec 6 13:45:05 2016 +0200

    AUTO-261 #comment Create opsgenie contact that includes service notifications on critical levels & recoveries.  Create contact group called KSEMERGENCY which will send to this opsgenie,slack and ks_support.  Add KSEMERGENCY as contact group for Show Leaves alert.

commit c8f5eb40949fcf912ca9ddeaa13ed697332362fe
Author: Pieter Steyn <[email protected]>
Date:   Tue Dec 6 10:04:27 2016 +0200

    AUTO-267 #comment Create a copy of the memsql status check script.  This one wont alert on memsql-ops failures, only on valid memsql-ops output trigger cases.  This due to the previous script having a retry now for memsql-ops timeouts, which may delay actual errors.

commit a1bb24b9897d29a9f140650b0772a0efcb183311
Merge: 7a484aa 0203512
Author: Pieter Steyn <[email protected]>
Date:   Thu Dec 1 12:29:19 2016 +0200

    Merged SSHFS Nagios code into develop

commit 0203512f4403aef28634d6a269ed378640f10f33
Author: Pieter Steyn <[email protected]>
Date:   Thu Dec 1 10:58:10 2016 +0200

    AUTO-330 Nagios config for SSHFS check

commit d9c0a7b35f3fc91a95e0b3675d0c8ff54bc6324b
Author: Pieter Steyn <[email protected]>
Date:   Tue Nov 29 17:30:04 2016 +0200

    AUTO-330 Add check_sshfs plugin.  Create NRPE command if nodetype is exec.

commit 7a484aa47246fa35f7028a9f71755f839525317b
Author: Manoj Kumar <[email protected]>
Date:   Mon Nov 28 20:36:09 2016 +0530

    AUTO-399 #comment corrected updates.pp indentation

commit ebe2c1af5c10e3b7ea8bb14195a1e4cd1f4ca69c
Author: Manoj Kumar <[email protected]>
Date:   Mon Nov 28 20:34:36 2016 +0530

    AUTO-399 #comment corrected updates.pp with sed -i instead of -e

commit bb8c34a7dd4e44637a113262525a5fa700d8848b
Author: Manoj Kumar <[email protected]>
Date:   Mon Nov 28 20:08:08 2016 +0530

    AUTO-399 #comment updated puppetmaster updates.pp with ks_role? = udm_puppet then replace and remove wordpress variables from hiera.yaml

commit a96489592b21a0b0d51724907c322fa81625dd34
Author: JP Viljoen <[email protected]>
Date:   Mon Nov 28 13:09:52 2016 +0200

    [java_ks] add providence info to document where java_ks-1.4.1 came from

commit 56aa96bdf3a06b91ee58b8d7a358ece2ec904269
Author: JP Viljoen <[email protected]>
Date:   Mon Nov 28 01:56:24 2016 +0200

    [forgemodules] java_ks for use by keystore module

commit e92a87169e0461e0cf0f87759319cf4a9a92bc0e
Merge: 69a3937 1e0413f
Author: Manoj Kumar <[email protected]>
Date:   Fri Nov 25 19:43:42 2016 +0530

    Merge branch 'develop' of bitbucket.org:kurtosysengineering/devops-puppet-master into develop

commit 69a3937b73392a35bf605e81ca4cf3f960f90c35
Author: Manoj Kumar <[email protected]>
Date:   Fri Nov 25 19:42:12 2016 +0530

    AUTO-410 #comment updated common/manifests/add_pkgs.pp with dos2unix package for servicetype java/app/tomcat

commit 1e0413fcf899c8807180a8bcaf7beee3f048b417
Author: Pieter Steyn <[email protected]>
Date:   Fri Nov 25 08:18:05 2016 +0200

    remove retries, takes too long and then NRPE times out.

commit 9b6839fa747bc36ab263d42c24235dba1e308419
Author: Pieter Steyn <[email protected]>
Date:   Thu Nov 24 14:41:39 2016 +0200

    Add a second retry, and change exit code to WARN instead of CRIT.

commit 65fe0f612f2d42bd99e1d891304142dc504fc7e2
Author: Pieter Steyn <[email protected]>
Date:   Thu Nov 24 10:04:59 2016 +0200

    AUTO-267 #comment Remove backup check.  Ive confirmed that backups to not cause timesout for memsql-ops.

commit c3eebf2dd69ce33cf37022128770f00223212a0c
Author: Pieter Steyn <[email protected]>
Date:   Thu Nov 24 09:43:58 2016 +0200

    AUTO-267 #comment Fix indentation.

commit fb879547753ad7d3cd3da0f5bcdb1caa7a14dddb
Author: Pieter Steyn <[email protected]>
Date:   Thu Nov 24 09:41:49 2016 +0200

    AUTO-267 #comment Add a timeout if memsql-ops fails the first time. Exit with Warning if backup is running.

commit feb47b108b5966f7792b0f5dd08de946c30f1d4d
Merge: 8614a71 ee4bb11
Author: Manoj Kumar <[email protected]>
Date:   Wed Nov 23 14:48:44 2016 +0530

    Merge branch 'develop' of bitbucket.org:kurtosysengineering/devops-puppet-master into develop

commit 8614a71d5f8f34f9ee2338317e47d3e7b61d95b6
Author: Manoj Kumar <[email protected]>
Date:   Wed Nov 23 14:48:20 2016 +0530

    added puppetmaster/files/config for StrictHostKeyChecking for git hiera

commit ee4bb11b8fe4367c58a315ec6bb9322ee0776dc7
Author: Pieter Steyn <[email protected]>
Date:   Wed Nov 23 09:52:00 2016 +0200

    Nagios fixes for external commands & pnp4nagios.  This broke along with the hiera restructure, and I missed it until now.

commit 8d6eac127bfefe6edac40c986a1ac1512067d7ef
Author: Pieter Steyn <[email protected]>
Date:   Tue Nov 22 15:05:27 2016 +0200

    DOJ-465 #comment Fix broken regexp.  Add performance data.