Merge branch 'rharriso/cleanup' into ose

* rharriso/cleanup:
  oo_zabbix: create app now reports correctly
  nagios: adding nagios_monitor to zabbix group
  correct --log-to option
  oo_zabbix: server_identities became servers
  logfile_parser.rb: better detect file truncation
  oo_zabbix: removed verbosity from logging
Merge branch 'rharriso/lokkit' into ose

* rharriso/lokkit:
  Remove cruft from old lokkit define
  Fix erb syntax errors
  Testing the new lokkit class in test
  Fix oo_zabbix to use the new lokkit::ports_from_ip4
  Add lokkit::ports_from_ip4 define to simplify the common task of allowing traffic to ports only from specific networks.
  site.pp - add int to zabbix_server_list
  oo_zabbix::sender - avoid duplicate resource declarations
  oo_zabbix::sender - avoid duplicate resource declarations
  oo_zabbix: include openshift_zabbix libs everywhere
  check-accept-node: log oo-accept-node output if check fails.
  oo_zabbix: refactor fix-rwsem check with openshift_zabbix libs
  oo_zabbix: refactor ipsec-status check with openshift_zabbix libs
  oo_zabbix: refactor elasticsearch check with openshift_zabbix libs
  oo_zabbix: clean up check-create-app a bit more
  oo_zabbix: refactor aria checks with openshift_zabbix libs
  ex-node.pp: removed hard coded IP for int.openshift.redhat.com (we shouldn't hard code IPs in puppet).
check-accept-node: log oo-accept-node output if check fails.
Merge branch 'ose' of puppet3.testflight.osc.redhat.com:/srv/git/puppet into ose

* 'ose' of puppet3.testflight.osc.redhat.com:/srv/git/puppet:
  Remove cruft from old lokkit define
  Fix erb syntax errors
  Testing the new lokkit class in test
  Fix oo_zabbix to use the new lokkit::ports_from_ip4
  Add lokkit::ports_from_ip4 define to simplify the common task of allowing traffic to ports only from specific networks.
  site.pp - add int to zabbix_server_list
  oo_zabbix::sender - avoid duplicate resource declarations
  oo_zabbix::sender - avoid duplicate resource declarations
  oo_zabbix: include openshift_zabbix libs everywhere
  check-accept-node: log oo-accept-node output if check fails.
  oo_zabbix: refactor fix-rwsem check with openshift_zabbix libs
  oo_zabbix: refactor ipsec-status check with openshift_zabbix libs
  oo_zabbix: refactor elasticsearch check with openshift_zabbix libs
  oo_zabbix: clean up check-create-app a bit more
  oo_zabbix: refactor aria checks with openshift_zabbix libs
  ex-node.pp: removed hard coded IP for int.openshift.redhat.com (we shouldn't hard code IPs in puppet).
Merge branch 'rharriso/cleanup' into ose

* rharriso/cleanup: (50 commits)
  The logrotate definition has to be before any other httpd classes are declared.
  disabling auto-idler
  Move to rotating httpd logs on the puppet masters daily
  Allow the httpd logrotate config to be overwritten
  moved logs to /var/log, moved prod run to off hours
  Document and improve logrotate::file
  oo_zabbix: fix typo
  oo_zabbix: refactor aws-dashboard check with openshift_zabbix libs
  fixed style error.
  removed the default httpd log rotate file from ex-nodes as we're not using it and it sometimes causes problems.
  oo_zabbix: one more require needs to be require_relative
  oo_zabbix: fix typo
  oo_zabbix: fix regression in ssh-check
  openshift: fixing require for threadpool
  oo_zabbix: fix typo
  oo_zabbix: updating to work with proxies
  changed ops-mc-idle-apps-collector to remove the results file once it's finished with it.
  oo_zabbix: refactor stickshift-fsck with openshift_zabbix libs.
  oo_zabbix: refactor ssh-check with openshift_zabbix libs.
  oo_zabbix: refactor raid-status check with openshift_zabbix libs.
  ...
Merge branch 'master' into ose
logfile_parser: another attempt at getting debug info
Merge branch 'master' into stg
Merge remote-tracking branch 'openshift/master' into ose
Merge remote-tracking branch 'openshift/master' into ose
Merge branch 'ose' of puppet3.testflight.osc.redhat.com:/srv/git/puppet into ose
Merge branch 'ose' of puppet1.ose.phx2.redhat.com:/srv/git/puppet into ose
Merge branch 'oss_zabbix' into stg
logfile_parser.rb: fix regex so we actually capture date stamp
check-user-action-log: don't save statefile when testing
Merge branch 'master' into stg
Merge branch 'quick' into stg
Merge branch 'oss_zabbix' into stg
Merge branch 'oss_zabbix' into stg
Merge branch 'quick' into stg