Index: head/net-mgmt/Makefile =================================================================== --- head/net-mgmt/Makefile (revision 451329) +++ head/net-mgmt/Makefile (revision 451330) @@ -1,396 +1,397 @@ # $FreeBSD$ # COMMENT = Network management tools SUBDIR += 2ping SUBDIR += TkTopNetFlows SUBDIR += adcli SUBDIR += aggregate SUBDIR += aircrack-ng SUBDIR += alertmanager SUBDIR += ap-utils SUBDIR += argus3 SUBDIR += argus3-clients SUBDIR += arpalert SUBDIR += arpscan SUBDIR += arpwatch SUBDIR += arts++ SUBDIR += bandwidthd SUBDIR += bgpq SUBDIR += bgpq3 SUBDIR += bgpuma SUBDIR += blackbox_exporter SUBDIR += bpft SUBDIR += braa SUBDIR += bsnmp-jails SUBDIR += bsnmp-regex SUBDIR += bsnmp-ucd SUBDIR += bwm-ng SUBDIR += cacti SUBDIR += cacti-spine SUBDIR += cacti88 SUBDIR += cacti88-spine SUBDIR += ccnet-client SUBDIR += ccnet-server SUBDIR += cdpd SUBDIR += cdpr SUBDIR += cdpsnarf SUBDIR += centreon-clib SUBDIR += check_ipmi_sensor SUBDIR += check_logfiles SUBDIR += check_multi SUBDIR += check_mysql_health SUBDIR += chillispot SUBDIR += choparp SUBDIR += cidr SUBDIR += ciscoconf SUBDIR += clog SUBDIR += cnagios SUBDIR += collectd5 SUBDIR += confregdecode SUBDIR += coovachilli SUBDIR += cowpatty SUBDIR += cricket SUBDIR += crmsh SUBDIR += darkstat SUBDIR += devmon SUBDIR += devmon-templates SUBDIR += dhcdrop SUBDIR += dhcp_probe SUBDIR += disco SUBDIR += dnsmap SUBDIR += docsis SUBDIR += driftnet SUBDIR += ehnt SUBDIR += etherape SUBDIR += ettercap SUBDIR += fastnetmon SUBDIR += fetchconfig SUBDIR += flow-extract SUBDIR += flow-tools SUBDIR += flowd SUBDIR += flowviewer SUBDIR += fprobe SUBDIR += glpi-plugins-fusioninventory-server SUBDIR += gnu-ipcalc SUBDIR += grepcidr SUBDIR += grepip SUBDIR += gsnmp SUBDIR += guifi-snpservices SUBDIR += hastmon SUBDIR += hawk SUBDIR += icinga SUBDIR += icinga-classicweb SUBDIR += icinga-core SUBDIR += icinga2 SUBDIR += icingaweb2 SUBDIR += icingaweb2-module-businessprocess SUBDIR += icingaweb2-module-cube SUBDIR += icingaweb2-module-director SUBDIR += icingaweb2-module-generictts SUBDIR += icingaweb2-module-grafana SUBDIR += icingaweb2-module-map SUBDIR += icingaweb2-module-vsphere SUBDIR += icli SUBDIR += icmpmonitor SUBDIR += icmpquery SUBDIR += iftop SUBDIR += intel-snap SUBDIR += iog SUBDIR += ipacctd SUBDIR += ipaudit SUBDIR += ipcad SUBDIR += ipcalc SUBDIR += ipplan SUBDIR += iprange SUBDIR += ipv6calc SUBDIR += ipv6gen SUBDIR += ipv6mon SUBDIR += irrtoolset SUBDIR += isic SUBDIR += jnettop SUBDIR += kapacitor SUBDIR += kismet SUBDIR += klg SUBDIR += lanmap SUBDIR += lg SUBDIR += librenms SUBDIR += librenms-agent SUBDIR += libsmi SUBDIR += lldpd SUBDIR += mbrowse SUBDIR += mk-livestatus SUBDIR += monitoring-plugins SUBDIR += mrtg SUBDIR += mrtg-ping-probe SUBDIR += mtrace SUBDIR += mysqld_exporter SUBDIR += nagcon SUBDIR += nagios SUBDIR += nagios-certexp-plugin SUBDIR += nagios-check_bacula SUBDIR += nagios-check_bacula5 SUBDIR += nagios-check_bacula9 SUBDIR += nagios-check_clamav SUBDIR += nagios-check_cpu_usage SUBDIR += nagios-check_dhcp.pl SUBDIR += nagios-check_email_delivery SUBDIR += nagios-check_hdd_health SUBDIR += nagios-check_hp_bladechassis SUBDIR += nagios-check_memcached_paranoid SUBDIR += nagios-check_mysql_slave SUBDIR += nagios-check_netsnmp SUBDIR += nagios-check_ports SUBDIR += nagios-check_postgres SUBDIR += nagios-check_puppet SUBDIR += nagios-check_relayd_status SUBDIR += nagios-check_smartmon SUBDIR += nagios-check_tftp SUBDIR += nagios-check_zpools SUBDIR += nagios-geom SUBDIR += nagios-openldap-plugins SUBDIR += nagios-pf-plugin SUBDIR += nagios-plugins SUBDIR += nagios-snmp-plugins SUBDIR += nagios-snmp-plugins-extras SUBDIR += nagios-spamd-plugin SUBDIR += nagios4 SUBDIR += nagiosagent SUBDIR += nagiosgraph SUBDIR += nagiosql SUBDIR += nagircbot SUBDIR += nagnu SUBDIR += nagstamon SUBDIR += nagtail SUBDIR += nagvis SUBDIR += nbtscan SUBDIR += ndoutils SUBDIR += ndpmon SUBDIR += nedi SUBDIR += nefu SUBDIR += net-snmp SUBDIR += netdata SUBDIR += netdisco SUBDIR += netdisco-mibs SUBDIR += netdot SUBDIR += netleak SUBDIR += netmagis-common SUBDIR += netmagis-database SUBDIR += netmagis-detecteq SUBDIR += netmagis-metro SUBDIR += netmagis-servers SUBDIR += netmagis-topo SUBDIR += netmagis-utils SUBDIR += netmagis-www SUBDIR += netmask SUBDIR += netspoc SUBDIR += netustad SUBDIR += netwag SUBDIR += networkmgr SUBDIR += netwox SUBDIR += netxms SUBDIR += nfdump SUBDIR += nfsen SUBDIR += ng_ipacct SUBDIR += nitpicker SUBDIR += nrpe SUBDIR += nrpe-ssl SUBDIR += nrpe3 SUBDIR += nsca SUBDIR += nsca-client SUBDIR += nsca-ng SUBDIR += nsca-ng-client SUBDIR += nsca27 SUBDIR += nsca27-client SUBDIR += nstat SUBDIR += nstreams SUBDIR += observium SUBDIR += ocsinventory-agent SUBDIR += ocsinventory-ng SUBDIR += omping SUBDIR += onionlauncher SUBDIR += openbmp SUBDIR += openlldp SUBDIR += openvmps SUBDIR += p0f SUBDIR += p0f2 SUBDIR += p5-AnyEvent-SNMP SUBDIR += p5-BigIP-iControl SUBDIR += p5-Cflow SUBDIR += p5-Cisco-CopyConfig SUBDIR += p5-Cisco-Reconfig SUBDIR += p5-Data-Validate-IP SUBDIR += p5-FusionInventory-Agent SUBDIR += p5-FusionInventory-Agent-Task-NetDiscovery SUBDIR += p5-FusionInventory-Agent-Task-SNMPQuery SUBDIR += p5-GRNOC-Config SUBDIR += p5-GRNOC-TL1 SUBDIR += p5-MRTG-Parse SUBDIR += p5-Mon SUBDIR += p5-Monitoring-Plugin SUBDIR += p5-NSNMP SUBDIR += p5-Nagios-Object SUBDIR += p5-Nagios-Plugin SUBDIR += p5-Nagios-Plugin-Beanstalk SUBDIR += p5-Nagios-Plugin-LDAP SUBDIR += p5-Nagios-Plugins-Memcached SUBDIR += p5-Net-ACL SUBDIR += p5-Net-Abuse-Utils SUBDIR += p5-Net-Abuse-Utils-Spamhaus SUBDIR += p5-Net-CIDR SUBDIR += p5-Net-ILO SUBDIR += p5-Net-IP SUBDIR += p5-Net-IP-Match-Regexp SUBDIR += p5-Net-IP-Match-XS SUBDIR += p5-Net-IP-Resolver SUBDIR += p5-Net-IPAddress SUBDIR += p5-Net-IPv4Addr SUBDIR += p5-Net-IPv6Addr SUBDIR += p5-Net-NSCA-Client SUBDIR += p5-Net-Netmask SUBDIR += p5-Net-OpenVPN-Manage SUBDIR += p5-Net-SNMP SUBDIR += p5-Net-SNMP-Util SUBDIR += p5-Net-SNMPTrapd SUBDIR += p5-Net-Telnet-Cisco-IOS SUBDIR += p5-NetAddr-IP SUBDIR += p5-NetAddr-IP-Lite SUBDIR += p5-NetApp SUBDIR += p5-POE-Component-SNMP SUBDIR += p5-SNMP-Info SUBDIR += p5-SNMP-MIB-Compiler SUBDIR += p5-SNMP-Simple SUBDIR += p5-SNMP-Trapinfo SUBDIR += p5-SNMP-Util SUBDIR += p5-SNMP_Session SUBDIR += p5-Telnet-Cisco SUBDIR += p5-Tie-NetAddr-IP SUBDIR += p5-Xymon SUBDIR += p5-Xymon-Client SUBDIR += p5-Xymon-Server SUBDIR += p5-Zenoss SUBDIR += p5-jmx4perl SUBDIR += packit SUBDIR += pads SUBDIR += pancho SUBDIR += pandorafms_agent SUBDIR += pandorafms_console SUBDIR += pandorafms_server + SUBDIR += pdagent-integrations SUBDIR += percona-monitoring-plugins SUBDIR += pftabled SUBDIR += php56-snmp SUBDIR += php70-snmp SUBDIR += php71-snmp SUBDIR += phpip SUBDIR += phpipam SUBDIR += phpweathermap SUBDIR += pixilate SUBDIR += pktstat SUBDIR += pmacct SUBDIR += pnp SUBDIR += pnp-icinga SUBDIR += pnp-icinga2 SUBDIR += portmon SUBDIR += prometheus SUBDIR += pushgateway SUBDIR += py-adal SUBDIR += py-ipcalc SUBDIR += py-ipy SUBDIR += py-msrest SUBDIR += py-msrestazure SUBDIR += py-pdagent SUBDIR += py-pyang SUBDIR += py-pysmi SUBDIR += py-pyzabbix SUBDIR += py-snmp4 SUBDIR += py-snmp4-apps SUBDIR += py-snmp4-mibs SUBDIR += py-snmp_passpersist SUBDIR += py-yapsnmp SUBDIR += py3-dnsdiag SUBDIR += qkismet SUBDIR += rackmonkey SUBDIR += rancid3 SUBDIR += rate SUBDIR += rcpd SUBDIR += remarp SUBDIR += resource-agents SUBDIR += riemann SUBDIR += riemann-c-client SUBDIR += rotorouter SUBDIR += routers2 SUBDIR += routers2-extensions SUBDIR += routers2-extras SUBDIR += rrdbot SUBDIR += rubygem-blimpy SUBDIR += rubygem-oxidized SUBDIR += rubygem-oxidized-script SUBDIR += rubygem-oxidized-web SUBDIR += rubygem-snmp SUBDIR += rubygem-visage-app SUBDIR += sblim-wbemcli SUBDIR += scli SUBDIR += sdig SUBDIR += seafile-client SUBDIR += seafile-gui SUBDIR += seafile-server SUBDIR += semaphore SUBDIR += send SUBDIR += sendip SUBDIR += sipcalc SUBDIR += sjitter SUBDIR += slate SUBDIR += smokeping SUBDIR += snmp++ SUBDIR += snmp4nagios SUBDIR += snmptt SUBDIR += softflowd SUBDIR += spectools SUBDIR += ssgless SUBDIR += statsd SUBDIR += statsite SUBDIR += subcalc SUBDIR += super_mediator SUBDIR += sx SUBDIR += sysmon SUBDIR += tcpreplay SUBDIR += tcptrack SUBDIR += telegraf SUBDIR += tornova SUBDIR += torrus SUBDIR += unbound_exporter SUBDIR += unifi5 SUBDIR += victorops-nagios SUBDIR += vidalia SUBDIR += virt-viewer SUBDIR += wdiag SUBDIR += weplab SUBDIR += whatmask SUBDIR += wifimgr SUBDIR += wmi-client SUBDIR += xymon-client SUBDIR += xymon-server SUBDIR += yaf SUBDIR += zabbix2-agent SUBDIR += zabbix2-frontend SUBDIR += zabbix2-proxy SUBDIR += zabbix2-server SUBDIR += zabbix22-agent SUBDIR += zabbix22-frontend SUBDIR += zabbix22-proxy SUBDIR += zabbix22-server SUBDIR += zabbix3-agent SUBDIR += zabbix3-frontend SUBDIR += zabbix3-proxy SUBDIR += zabbix3-server SUBDIR += zabbix32-agent SUBDIR += zabbix32-frontend SUBDIR += zabbix32-proxy SUBDIR += zabbix32-server SUBDIR += zabbix34-agent SUBDIR += zabbix34-frontend SUBDIR += zabbix34-proxy SUBDIR += zabbix34-server .include Index: head/net-mgmt/pdagent-integrations/Makefile =================================================================== --- head/net-mgmt/pdagent-integrations/Makefile (nonexistent) +++ head/net-mgmt/pdagent-integrations/Makefile (revision 451330) @@ -0,0 +1,40 @@ +# Created by: Mark Felder +# $FreeBSD$ + +PORTNAME= pdagent-integrations +PORTVERSION= 1.4 +DISTVERSIONPREFIX=v +CATEGORIES= net-mgmt python + +MAINTAINER= feld@FreeBSD.org +COMMENT= PagerDuty integrations for monitoring monitoring tools + +LICENSE= BSD3CLAUSE + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdagent>0:net-mgmt/py-pdagent + +USES= python shebangfix + +USE_GITHUB= yes +GH_ACCOUNT= PagerDuty + +SHEBANG_FILES= bin/* + +SUB_FILES= pagerduty-icinga2.conf pkg-message + +NO_ARCH= yes +NO_BUILD= yes + +post-patch: + ${REINPLACE_CMD} 's|/usr/share/pdagent-integrations/bin|${PREFIX}/bin|g' ${WRKSRC}/pagerduty_nagios.cfg ${WRKSRC}/conf.d/sensu_pagerduty_handler.json + +do-install: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/bin/pd-nagios ${STAGEDIR}${LOCALBASE}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bin/pd-sensu ${STAGEDIR}${LOCALBASE}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bin/pd-zabbix ${STAGEDIR}${LOCALBASE}/bin + ${INSTALL_DATA} ${WRKSRC}/conf.d/sensu_pagerduty_handler.json ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/pagerduty_nagios.cfg ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKDIR}/pagerduty-icinga2.conf ${STAGEDIR}${EXAMPLESDIR} + +.include Property changes on: head/net-mgmt/pdagent-integrations/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/pdagent-integrations/distinfo =================================================================== --- head/net-mgmt/pdagent-integrations/distinfo (nonexistent) +++ head/net-mgmt/pdagent-integrations/distinfo (revision 451330) @@ -0,0 +1,3 @@ +TIMESTAMP = 1507219750 +SHA256 (PagerDuty-pdagent-integrations-v1.4_GH0.tar.gz) = f4d18b1759ee0dfdcff4dd10f73c2bd3dd5d1ef0e2629141edd5f07f32c6e4f1 +SIZE (PagerDuty-pdagent-integrations-v1.4_GH0.tar.gz) = 17643 Property changes on: head/net-mgmt/pdagent-integrations/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/pdagent-integrations/files/pagerduty-icinga2.conf.in =================================================================== --- head/net-mgmt/pdagent-integrations/files/pagerduty-icinga2.conf.in (nonexistent) +++ head/net-mgmt/pdagent-integrations/files/pagerduty-icinga2.conf.in (revision 451330) @@ -0,0 +1,91 @@ +object User "pagerduty" { + pager = "YOUR-INTEGRATION-KEY-HERE" + groups = [ "icingaadmins" ] + display_name = "PagerDuty Notification User" + states = [ OK, Warning, Critical, Unknown, Up, Down ] + types = [ Problem, Acknowledgement, Recovery ] +} + +object NotificationCommand "notify-service-by-pagerduty" { + import "plugin-notification-command" + command = [ "%%PREFIX%%/bin/pd-nagios" ] + arguments = { + "-n" = { + order = 0 + value = "service" + } + "-k" = { + order = 1 + value = "$user.pager$" + } + "-t" = { + order = 2 + value = "$notification.type$" + } + "-f" = { + order = 3 + repeat_key = true + value = "$f_args$" + } + } + + vars.f_args = [ + "SERVICEDESC=$service.name$", + "SERVICEDISPLAYNAME=$service.display_name$", + "HOSTNAME=$host.name$", + "HOSTSTATE=$host.state$", + "HOSTDISPLAYNAME=$host.display_name$", + "SERVICESTATE=$service.state$", + "SERVICEPROBLEMID=$service.state_id$", + "SERVICEOUTPUT=$service.output$" + ] +} + +object NotificationCommand "notify-host-by-pagerduty" { + import "plugin-notification-command" + command = [ "%%PREFIX%%/bin/pd-nagios" ] + arguments = { + "-n" = { + order = 0 + value = "host" + } + "-k" = { + order = 1 + value = "$user.pager$" + } + "-t" = { + order = 2 + value = "$notification.type$" + } + "-f" = { + order = 3 + repeat_key = true + value = "$f_args$" + } + } + + vars.f_args = [ + "HOSTNAME=$host.name$", + "HOSTSTATE=$host.state$", + "HOSTPROBLEMID=$host.state_id$", + "HOSTOUTPUT=$host.output$" + ] +} + +apply Notification "pagerduty-service" to Service { + command = "notify-service-by-pagerduty" + states = [ OK, Warning, Critical, Unknown ] + types = [ Problem, Acknowledgement, Recovery ] + period = "24x7" + users = [ "pagerduty" ] + assign where service.vars.enable_pagerduty == true +} + +apply Notification "pagerduty-host" to Host { + command = "notify-host-by-pagerduty" + states = [ Up, Down ] + types = [ Problem, Acknowledgement, Recovery ] + period = "24x7" + users = [ "pagerduty" ] + assign where host.vars.enable_pagerduty == true +} Property changes on: head/net-mgmt/pdagent-integrations/files/pagerduty-icinga2.conf.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/pdagent-integrations/files/patch-bin_pd-nagios =================================================================== --- head/net-mgmt/pdagent-integrations/files/patch-bin_pd-nagios (nonexistent) +++ head/net-mgmt/pdagent-integrations/files/patch-bin_pd-nagios (revision 451330) @@ -0,0 +1,11 @@ +--- bin/pd-nagios.orig 2017-10-05 18:21:38 UTC ++++ bin/pd-nagios +@@ -101,7 +101,7 @@ class NagiosEvent: + if not NagiosEvent.REQUIRED_FIELDS[self._notification_type].issubset(self._details.keys()): + msg = "Missing fields for type '{0}'. {1} required".format( + self._notification_type, +- ", ".join(self._required_fields()) ++ ", ".join(NagiosEvent.REQUIRED_FIELDS[self._notification_type]) + ) + raise ValueError(msg) + Property changes on: head/net-mgmt/pdagent-integrations/files/patch-bin_pd-nagios ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/pdagent-integrations/files/pkg-message.in =================================================================== --- head/net-mgmt/pdagent-integrations/files/pkg-message.in (nonexistent) +++ head/net-mgmt/pdagent-integrations/files/pkg-message.in (revision 451330) @@ -0,0 +1,2 @@ +Sample configuration files for Nagios, Icinga and Sensu can be found in the +%%EXAMPLESDIR%% directory. Property changes on: head/net-mgmt/pdagent-integrations/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/pdagent-integrations/pkg-descr =================================================================== --- head/net-mgmt/pdagent-integrations/pkg-descr (nonexistent) +++ head/net-mgmt/pdagent-integrations/pkg-descr (revision 451330) @@ -0,0 +1,10 @@ +This project contains integrations for various monitoring tools with +the PagerDuty Agent. + +It currently includes support for: + + Nagios + Sensu + Zabbix + +WWW: https://github.com/PagerDuty/pdagent-integrations Property changes on: head/net-mgmt/pdagent-integrations/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/pdagent-integrations/pkg-plist =================================================================== --- head/net-mgmt/pdagent-integrations/pkg-plist (nonexistent) +++ head/net-mgmt/pdagent-integrations/pkg-plist (revision 451330) @@ -0,0 +1,6 @@ +bin/pd-nagios +bin/pd-sensu +bin/pd-zabbix +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pagerduty_nagios.cfg +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pagerduty-icinga2.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sensu_pagerduty_handler.json Property changes on: head/net-mgmt/pdagent-integrations/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property