diff --git a/sample-config.yml b/sample-config.yml index 8399c6e..6309202 100644 --- a/sample-config.yml +++ b/sample-config.yml @@ -14,12 +14,12 @@ alerts: mailgun: command: > curl -s -X POST - -F subject="Alert! {alert_name} failed" + -F subject="Alert! {monitor_name} failed" -F from="Minitor " -F to=me@minitor.mon -F text="Our monitor failed" https://api.mailgun.net/v3/minitor.mon/messages - -u "api:${TWILIO_API_KEY}" + -u "api:${MAILGUN_API_KEY}" sms: command: > curl -s -X POST -F "Body=Failure: {monitor_name} has failed" diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..b88034e --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[metadata] +description-file = README.md diff --git a/setup.py b/setup.py index 6a03163..7ff2f68 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,4 @@ -"""A setuptools based setup module. - -See: -https://packaging.python.org/en/latest/distributing.html -https://github.com/pypa/sampleproject -""" - -# Always prefer setuptools over distutils from setuptools import setup, find_packages -# To use a consistent encoding from codecs import open from os import path @@ -17,27 +8,20 @@ here = path.abspath(path.dirname(__file__)) with open(path.join(here, 'README.md'), encoding='utf-8') as f: long_description = f.read() -# Arguments marked as "Required" below must be included for upload to PyPI. -# Fields marked as "Optional" may be commented out. - setup( name='minitor', version='0.1.0', description='A minimal monitoring tool', long_description=long_description, url='https://git.iamthefij.com/iamthefij/minitor', + download_url='https://git.iamthefij.com/iamthefij/minitor/archive/master.tar.gz' author='Ian Fijolek', author_email='ian@iamthefij.com', - # Classifiers help users find your project by categorizing it. - # - # For a list of valid classifiers, see - # https://pypi.python.org/pypi?%3Aaction=list_classifiers classifiers=[ # How mature is this project? Common values are - # 3 - Alpha # 4 - Beta # 5 - Production/Stable - 'Development Status :: 3 - Alpha', + 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', 'Intended Audience :: System Administrators', 'Topic :: System :: Monitoring', @@ -48,18 +32,10 @@ setup( 'Programming Language :: Python :: 3.6', ], keywords='minitor monitoring alerting', - packages=find_packages(exclude=['contrib', 'docs', 'tests']), # Required + packages=find_packages(exclude=['contrib', 'docs', 'tests']), install_requires=[ 'yamlenv', ], - - # To provide executable scripts, use entry points in preference to the - # "scripts" keyword. Entry points provide cross-platform support and allow - # `pip` to create the appropriate form of executable for the target - # platform. - # - # For example, the following would provide a command called `sample` which - # executes the function `main` from this package when invoked: entry_points={ 'console_scripts': [ 'minitor=minitor.main:main',