diff --git a/AUTHORS b/AUTHORS index 3e9b1a2..f180b77 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,16 +2,22 @@ Aivars Šterns <asterns@evolutiongaming.com> Angel Velasquez <avelasquez@sangoma.com> Angel Velásquez <angvp@archlinux.org> Angel Velásquez <avelasquez@sangoma.com> +Arindam Choudhury <arindam@live.com> +Christian Blunden <christian.blunden@gmail.com> int32bit <krystism@gmail.com> Jacek Grzechnik <jacek.grzechnik@mbank.pl> Joao Mesquita <jmesquita@sangoma.com> Marco <marco@supino.org> +Marco Supino <marco@drivenets.net> +marksmyth <smythmark1980@gmail.com> Minh Danh <minhdanh@hoiio.com> Moises Silva <msilva@sangoma.com> Nick Satterly <nick.satterly@theguardian.com> Rafael Matias <rafael.matias@centralway.com> root <root@ubu001.pod01.secdo.net> +Scott Mullaly <scott.mullaly@orionhealth.com> SK <skobolo@gmail.com> +thehill <thehill@users.noreply.github.com> Карамышев Степан <karamyshev@corp.sputnik.ru> diff --git a/LICENSE b/LICENSE index 3bfde2d..35ce0b7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2014-2016 Nick Satterly +Copyright (c) 2014-2017 Nick Satterly and AUTHORS Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 8109ed6..3c6b0ac 100644 --- a/README.md +++ b/README.md @@ -54,5 +54,5 @@ Plugins License ------- -Copyright (c) 2014-2017 Nick Satterly. Available under the MIT License. +Copyright (c) 2014-2017 Nick Satterly and [AUTHORS](AUTHORS). Available under the MIT License. diff --git a/integrations/mailer/README.md b/integrations/mailer/README.md index 23c4523..d0eb382 100644 --- a/integrations/mailer/README.md +++ b/integrations/mailer/README.md @@ -161,4 +161,4 @@ To execute unit-tests run: License ------- -Copyright (c) 2015-2016 Nick Satterly and [AUTHORS](AUTHORS). Available under the MIT License. +Copyright (c) 2015-2016 Nick Satterly and [AUTHORS](/AUTHORS). Available under the MIT License. diff --git a/integrations/snmptrap/setup.py b/integrations/snmptrap/setup.py index dc55b40..7271edc 100644 --- a/integrations/snmptrap/setup.py +++ b/integrations/snmptrap/setup.py @@ -7,7 +7,7 @@ setuptools.setup( version='3.3.2', description='Alerta script for SNMP traps', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', py_modules=['handler'], diff --git a/integrations/sqs/setup.py b/integrations/sqs/setup.py index b603224..7255201 100644 --- a/integrations/sqs/setup.py +++ b/integrations/sqs/setup.py @@ -9,7 +9,7 @@ setuptools.setup( version=version, description='Alerta integration for AWS SQS', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', py_modules=['alerta_sqs'], diff --git a/integrations/syslog/setup.py b/integrations/syslog/setup.py index 1f2b51c..8f94478 100644 --- a/integrations/syslog/setup.py +++ b/integrations/syslog/setup.py @@ -9,7 +9,7 @@ setuptools.setup( version=version, description='Alerta script for Syslog messages', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', py_modules=['syslogfwder'], diff --git a/integrations/urlmon/setup.py b/integrations/urlmon/setup.py index a66d343..8e2c07b 100644 --- a/integrations/urlmon/setup.py +++ b/integrations/urlmon/setup.py @@ -9,7 +9,7 @@ setuptools.setup( version=version, description='Alerta script for URL monitoring', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', py_modules=['urlmon'], diff --git a/plugins/amqp/setup.py b/plugins/amqp/setup.py index 548c6d9..5be7fb7 100644 --- a/plugins/amqp/setup.py +++ b/plugins/amqp/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for AMQP messaging', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/cachet/setup.py b/plugins/cachet/setup.py index 8478d1d..0b66fca 100644 --- a/plugins/cachet/setup.py +++ b/plugins/cachet/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for Cachet status page', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/enhance/setup.py b/plugins/enhance/setup.py index de19cc9..c93260d 100644 --- a/plugins/enhance/setup.py +++ b/plugins/enhance/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for alert enhancement', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/geoip/setup.py b/plugins/geoip/setup.py index 48acab1..efcdd8e 100644 --- a/plugins/geoip/setup.py +++ b/plugins/geoip/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for GeoIP Lookup', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/hipchat/setup.py b/plugins/hipchat/setup.py index f9e9d60..564f488 100644 --- a/plugins/hipchat/setup.py +++ b/plugins/hipchat/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for HipChat', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/influxdb/setup.py b/plugins/influxdb/setup.py index 7d3b064..140abfb 100644 --- a/plugins/influxdb/setup.py +++ b/plugins/influxdb/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for InfluxDB v1.1', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/logstash/setup.py b/plugins/logstash/setup.py index 31b3aec..9db5e1e 100644 --- a/plugins/logstash/setup.py +++ b/plugins/logstash/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for ELK logstash', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/normalise/setup.py b/plugins/normalise/setup.py index 3628843..37d87f0 100644 --- a/plugins/normalise/setup.py +++ b/plugins/normalise/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for alert normalisation', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/pagerduty/setup.py b/plugins/pagerduty/setup.py index fe86ad9..db67633 100644 --- a/plugins/pagerduty/setup.py +++ b/plugins/pagerduty/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for PagerDuty', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/prometheus/setup.py b/plugins/prometheus/setup.py index bfb6bf2..6bc4a8b 100644 --- a/plugins/prometheus/setup.py +++ b/plugins/prometheus/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for Prometheus Alertmanager', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/pubsub/setup.py b/plugins/pubsub/setup.py index 1271142..de7b228 100644 --- a/plugins/pubsub/setup.py +++ b/plugins/pubsub/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for sending alerts to pubsub', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Arindam Choudhury', author_email='arindam@live.com', packages=find_packages(), diff --git a/plugins/sns/setup.py b/plugins/sns/setup.py index 928f1a2..0c77ec5 100644 --- a/plugins/sns/setup.py +++ b/plugins/sns/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for AWS SNS', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(), diff --git a/plugins/twilio/setup.py b/plugins/twilio/setup.py index 32833a1..26daea7 100644 --- a/plugins/twilio/setup.py +++ b/plugins/twilio/setup.py @@ -8,7 +8,7 @@ setup( version=version, description='Alerta plugin for Twilio SMS', url='https://github.com/alerta/alerta-contrib', - license='Apache License 2.0', + license='MIT', author='Nick Satterly', author_email='nick.satterly@theguardian.com', packages=find_packages(),