diff options
| author | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
| commit | dbe2d838ba6834788265029162b2dd7d82473335 (patch) | |
| tree | a4eb38f7fc91d91269b6f83453de62242c6ddc23 | |
| parent | 5a782f6c8f7923f9f415afd504ce6e71acbc7fef (diff) | |
| parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
god/temper/Makefile
god/temper/collectd-temper.sh
| -rw-r--r-- | assets/doc/ass.txt (renamed from cholerab/assets/ass.txt) | 0 | ||||
| -rw-r--r-- | assets/doc/lexikon.txt (renamed from cholerab/assets/lexikon.txt) | 0 | ||||
| -rw-r--r-- | assets/doc/structs.nojson (renamed from cholerab/assets/structs.nojson) | 0 | ||||
| -rw-r--r-- | assets/doc/usecases.txt (renamed from cholerab/assets/usecases.txt) | 0 | ||||
| -rw-r--r-- | boot/lighttpd.conf | 12 | ||||
| l--------- | boot/painload.sh | 1 | ||||
| l--------- | boot/retiolum.sh | 1 | ||||
| -rw-r--r-- | cholerab/AGENDA | 4 | ||||
| -rw-r--r-- | cholerab/ENTERPRISE_PATTERN (renamed from cholerab/pattern/README) | 16 | ||||
| -rw-r--r-- | cholerab/bling/krebs_aquarium.svg | 87 | ||||
| -rw-r--r-- | cholerab/bling/krebs_plain.svg | 130 | ||||
| -rw-r--r-- | cholerab/manifest | 5 | ||||
| -rw-r--r-- | evan/Makefile | 9 | ||||
| -rw-r--r-- | god/Eselkalk/README | 3 | ||||
| -rw-r--r-- | god/Eselkalk/index.js (renamed from shack/Eselkalk/index.js) | 0 | ||||
| -rw-r--r-- | god/Monitoring/collectd/collectd.conf (renamed from Monitoring/collectd/collectd.conf) | 0 | ||||
| -rw-r--r-- | god/Monitoring/collectd/supervisor.d/collectd.conf (renamed from Monitoring/collectd/supervisor.d/collectd.conf) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/Makefile (renamed from Monitoring/nagios/Makefile) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/TODO (renamed from Monitoring/nagios/TODO) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/extinfo.cfg (renamed from Monitoring/nagios/conf/extinfo.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/hostgroups_generic.cfg (renamed from Monitoring/nagios/conf/hostgroups_generic.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/krebs_hosts.cfg (renamed from Monitoring/nagios/conf/krebs_hosts.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/krebsnet.cfg (renamed from Monitoring/nagios/conf/krebsnet.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/localhost.cfg (renamed from Monitoring/nagios/conf/localhost.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/other_hosts.cfg (renamed from Monitoring/nagios/conf/other_hosts.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/services.cfg (renamed from Monitoring/nagios/conf/services.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/shack_contacts.cfg (renamed from Monitoring/nagios/conf/shack_contacts.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/shack_guests.cfg (renamed from Monitoring/nagios/conf/shack_guests.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/shack_infrastructure.cfg (renamed from Monitoring/nagios/conf/shack_infrastructure.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/shacknet.cfg (renamed from Monitoring/nagios/conf/shacknet.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/templates.cfg (renamed from Monitoring/nagios/conf/templates.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/timeperiods.cfg (renamed from Monitoring/nagios/conf/timeperiods.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/tinc_hosts.cfg (renamed from Monitoring/nagios/conf/tinc_hosts.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/tincnet.cfg (renamed from Monitoring/nagios/conf/tincnet.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.gd2 (renamed from Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.png) | bin | 3681 -> 3681 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/favicon.ico (renamed from Monitoring/nagios/htdocs/images/logos/krebs/favicon.ico) | bin | 822 -> 822 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/krebs.gd2 (renamed from Monitoring/nagios/htdocs/images/logos/krebs/krebs.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/krebs.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/krebs.png) | bin | 238 -> 238 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/shack.gd2 (renamed from Monitoring/nagios/htdocs/images/logos/krebs/shack.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/shack.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/shack.png) | bin | 316 -> 316 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/tinc.gd2 (renamed from Monitoring/nagios/htdocs/images/logos/krebs/tinc.gd2) | bin | 1305 -> 1305 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/tinc.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/tinc.png) | bin | 361 -> 361 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.gd2 (renamed from Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.png) | bin | 883 -> 883 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point_64.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point_64.png) | bin | 5364 -> 5364 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htpasswd.users (renamed from Monitoring/nagios/htpasswd.users) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check.bat (renamed from Monitoring/nagios/plugins/check.bat) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check.sh (renamed from Monitoring/nagios/plugins/check.sh) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_apt (renamed from Monitoring/nagios/plugins/check_apt) | bin | 106120 -> 106120 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_bgpstate (renamed from Monitoring/nagios/plugins/check_bgpstate) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_breeze (renamed from Monitoring/nagios/plugins/check_breeze) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_btcguild_miner (renamed from Monitoring/nagios/plugins/check_btcguild_miner) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_by_ssh (renamed from Monitoring/nagios/plugins/check_by_ssh) | bin | 46192 -> 46192 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_clamd (renamed from Monitoring/nagios/plugins/check_clamd) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_cluster (renamed from Monitoring/nagios/plugins/check_cluster) | bin | 32072 -> 32072 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_cpu (renamed from Monitoring/nagios/plugins/check_cpu) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_dhcp (renamed from Monitoring/nagios/plugins/check_dhcp) | bin | 44816 -> 44816 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_dig (renamed from Monitoring/nagios/plugins/check_dig) | bin | 41392 -> 41392 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_disk (renamed from Monitoring/nagios/plugins/check_disk) | bin | 119216 -> 119216 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_disk_smb (renamed from Monitoring/nagios/plugins/check_disk_smb) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_dns (renamed from Monitoring/nagios/plugins/check_dns) | bin | 45488 -> 45488 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_dummy (renamed from Monitoring/nagios/plugins/check_dummy) | bin | 28968 -> 28968 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_dummy.sh (renamed from Monitoring/nagios/plugins/check_dummy.sh) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_file_age (renamed from Monitoring/nagios/plugins/check_file_age) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_flexlm (renamed from Monitoring/nagios/plugins/check_flexlm) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_fping (renamed from Monitoring/nagios/plugins/check_fping) | bin | 44656 -> 44656 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_ftp (renamed from Monitoring/nagios/plugins/check_ftp) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_game (renamed from Monitoring/nagios/plugins/check_game) | bin | 36584 -> 36584 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_host (renamed from Monitoring/nagios/plugins/check_host) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_hpjd (renamed from Monitoring/nagios/plugins/check_hpjd) | bin | 41136 -> 41136 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_http (renamed from Monitoring/nagios/plugins/check_http) | bin | 164624 -> 164624 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_icmp (renamed from Monitoring/nagios/plugins/check_icmp) | bin | 49264 -> 49264 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ide_smart (renamed from Monitoring/nagios/plugins/check_ide_smart) | bin | 34536 -> 34536 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ifoperstatus (renamed from Monitoring/nagios/plugins/check_ifoperstatus) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ifstatus (renamed from Monitoring/nagios/plugins/check_ifstatus) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_imap (renamed from Monitoring/nagios/plugins/check_imap) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ircd (renamed from Monitoring/nagios/plugins/check_ircd) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_jabber (renamed from Monitoring/nagios/plugins/check_jabber) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ldap (renamed from Monitoring/nagios/plugins/check_ldap) | bin | 40816 -> 40816 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_ldaps (renamed from Monitoring/nagios/plugins/check_ldaps) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_linux_raid (renamed from Monitoring/nagios/plugins/check_linux_raid) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_load (renamed from Monitoring/nagios/plugins/check_load) | bin | 36168 -> 36168 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_log (renamed from Monitoring/nagios/plugins/check_log) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mailq (renamed from Monitoring/nagios/plugins/check_mailq) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mem.pl (renamed from Monitoring/nagios/plugins/check_mem.pl) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mrtg (renamed from Monitoring/nagios/plugins/check_mrtg) | bin | 36264 -> 36264 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mrtgtraf (renamed from Monitoring/nagios/plugins/check_mrtgtraf) | bin | 34440 -> 34440 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mysql (renamed from Monitoring/nagios/plugins/check_mysql) | bin | 45936 -> 45936 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mysql_query (renamed from Monitoring/nagios/plugins/check_mysql_query) | bin | 44688 -> 44688 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_nagios (renamed from Monitoring/nagios/plugins/check_nagios) | bin | 36616 -> 36616 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_nntp (renamed from Monitoring/nagios/plugins/check_nntp) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_nntps (renamed from Monitoring/nagios/plugins/check_nntps) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_nt (renamed from Monitoring/nagios/plugins/check_nt) | bin | 48720 -> 48720 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ntp (renamed from Monitoring/nagios/plugins/check_ntp) | bin | 46288 -> 46288 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ntp_peer (renamed from Monitoring/nagios/plugins/check_ntp_peer) | bin | 44880 -> 44880 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ntp_time (renamed from Monitoring/nagios/plugins/check_ntp_time) | bin | 42224 -> 42224 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_nwstat (renamed from Monitoring/nagios/plugins/check_nwstat) | bin | 60912 -> 60912 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_oracle (renamed from Monitoring/nagios/plugins/check_oracle) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_overcr (renamed from Monitoring/nagios/plugins/check_overcr) | bin | 40400 -> 40400 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_pgsql (renamed from Monitoring/nagios/plugins/check_pgsql) | bin | 40656 -> 40656 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ping (renamed from Monitoring/nagios/plugins/check_ping) | bin | 48848 -> 48848 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_pop (renamed from Monitoring/nagios/plugins/check_pop) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_procs (renamed from Monitoring/nagios/plugins/check_procs) | bin | 114640 -> 114640 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_radius (renamed from Monitoring/nagios/plugins/check_radius) | bin | 40624 -> 40624 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_real (renamed from Monitoring/nagios/plugins/check_real) | bin | 40464 -> 40464 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_rpc (renamed from Monitoring/nagios/plugins/check_rpc) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_rta_multi (renamed from Monitoring/nagios/plugins/check_rta_multi) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_sensors (renamed from Monitoring/nagios/plugins/check_sensors) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_shinken.py (renamed from Monitoring/nagios/plugins/check_shinken.py) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_simap (renamed from Monitoring/nagios/plugins/check_simap) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_sip (renamed from Monitoring/nagios/plugins/check_sip) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_smtp (renamed from Monitoring/nagios/plugins/check_smtp) | bin | 127216 -> 127216 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_snmp (renamed from Monitoring/nagios/plugins/check_snmp) | bin | 152008 -> 152008 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_speed (renamed from Monitoring/nagios/plugins/check_speed) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_spop (renamed from Monitoring/nagios/plugins/check_spop) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ssh (renamed from Monitoring/nagios/plugins/check_ssh) | bin | 36688 -> 36688 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_ssmtp (renamed from Monitoring/nagios/plugins/check_ssmtp) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_swap (renamed from Monitoring/nagios/plugins/check_swap) | bin | 37832 -> 37832 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_tcp (renamed from Monitoring/nagios/plugins/check_tcp) | bin | 49328 -> 49328 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_temper (renamed from Monitoring/nagios/plugins/check_temper) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_time (renamed from Monitoring/nagios/plugins/check_time) | bin | 38128 -> 38128 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_udp (renamed from Monitoring/nagios/plugins/check_udp) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ups (renamed from Monitoring/nagios/plugins/check_ups) | bin | 44560 -> 44560 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_users (renamed from Monitoring/nagios/plugins/check_users) | bin | 36168 -> 36168 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_wave (renamed from Monitoring/nagios/plugins/check_wave) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/getwmic.sh (renamed from Monitoring/nagios/plugins/getwmic.sh) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/link_vmware_host_vm.py (renamed from Monitoring/nagios/plugins/link_vmware_host_vm.py) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/negate (renamed from Monitoring/nagios/plugins/negate) | bin | 38152 -> 38152 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/nmap_discovery_runner.py (renamed from Monitoring/nagios/plugins/nmap_discovery_runner.py) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/notify.sh (renamed from Monitoring/nagios/plugins/notify.sh) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/notify_irc (renamed from Monitoring/nagios/plugins/notify_irc) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/nsca_client.py (renamed from Monitoring/nagios/plugins/nsca_client.py) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/sendmailhost.pl (renamed from Monitoring/nagios/plugins/sendmailhost.pl) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/sendmailservices.pl (renamed from Monitorin |
