Skip to content

Commit dcc757a

Browse files
satterlysatterly
committed
First commit for Release 5.x
1 parent 08b7d92 commit dcc757a

File tree

125 files changed

+8065
-6055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+8065
-6055
lines changed

‎LICENSE

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Apache License
32
Version 2.0, January 2004
43
http://www.apache.org/licenses/
@@ -179,15 +178,15 @@
179178
APPENDIX: How to apply the Apache License to your work.
180179

181180
To apply the Apache License to your work, attach the following
182-
boilerplate notice, with the fields enclosed by brackets "[]"
181+
boilerplate notice, with the fields enclosed by brackets "{}"
183182
replaced with your own identifying information. (Don't include
184183
the brackets!) The text should be enclosed in the appropriate
185184
comment syntax for the file format. We also recommend that a
186185
file or class name and description of purpose be included on the
187186
same "printed page" as the copyright notice for easier
188187
identification within third-party archives.
189188

190-
Copyright [yyyy] [name of copyright owner]
189+
Copyright {yyyy} {name of copyright owner}
191190

192191
Licensed under the Apache License, Version 2.0 (the "License");
193192
you may not use this file except in compliance with the License.

‎MANIFEST.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
include VERSION
22
include LICENSE
3+
include NOTICE
34
include README.md
45
exclude .gitignore
56
global-exclude *.pyc
67
include alerta/app/app.wsgi
78
recursive-include alerta/app/templates *
8-
recursive-include alerta/app/static *
9+
recursive-include alerta/app/static *

‎Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ help:
1111
@echo "Commands:"
1212
@echo " init Initialise environment"
1313
@echo " pylint Lint source code"
14+
@echo " clean Clean source"
1415
@echo " test Run tests"
16+
@echo " run Run application"
17+
@echo " tag Git tag with current version"
18+
@echo " upload Upload package to PyPI"
1519
@echo ""
1620

1721
init:
@@ -26,12 +30,12 @@ clean:
2630
rm -Rf build dist *.egg-info
2731

2832
test:
29-
nosetests tests
33+
ALERTA_SVR_CONF_FILE= nosetests tests
3034

3135
run:
32-
alertad
36+
alertad run --with-threads
3337

34-
git-tag:
38+
tag:
3539
git tag -a v$(VERSION) -m "version $(VERSION)"
3640

3741
upload:

‎NOTICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Alerta monitoring system and console
2-
Copyright 2012 Guardian News & Media
2+
Copyright 2012-2017 Guardian News & Media
33

44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

‎README-wip.md

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
2+
Alerta 5
3+
========
4+
5+
Development
6+
-----------
7+
8+
```
9+
$ git clone ...
10+
$ cd alerta5
11+
$ export DATABASE_ENGINE=mongodb
12+
$ export FLASK_APP=alerta/api.py
13+
$ export SENTRY_DSN=https://8b56098250544fb78b9578d8af2a7e13:[email protected]/153768
14+
$ flask run --debugger --reload
15+
```
16+
17+
or
18+
19+
```
20+
$ FLASK_APP=alerta/api.py flask run --debugger --port 8080 --with-threads --reload
21+
```
22+
23+
or
24+
25+
```
26+
$ alertad run --port 8080 --reload
27+
```
28+
29+
30+
```
31+
$ FLASK_APP=alerta/api.py DATABASE_ENGINE=postgres flask run --debugger --port 8080 --with-threads --reload
32+
```
33+
34+
To do
35+
-----
36+
1. tests to ensure API compat - controller, model, db?
37+
2. auto-setup mongo
38+
3. auto-setup es
39+
4. auto-setup postgres
40+
5. logging
41+
6. debug
42+
7. wsgi
43+
9. auth
44+
10. docs - postgres db setup ?
45+
46+
47+
Testing
48+
-------
49+
to test with different database backends
50+
$ export DATABASE_ENGINE=elasticsearch
51+
$ nosetests
52+
53+
Postgres Installation
54+
---------------------
55+
```
56+
$ createdb alerta5
57+
$ flyway migrate
58+
```
59+

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Alerta Release 4.9
1+
Alerta Release 5.0
22
==================
33

44
[![Build Status](https://travis-ci.org/guardian/alerta.png)](https://travis-ci.org/guardian/alerta) [![Gitter chat](https://badges.gitter.im/alerta/chat.png)](https://gitter.im/alerta/chat)
@@ -46,7 +46,7 @@ To install MongoDB on Debian/Ubuntu run::
4646
To install the Alerta server and client run::
4747

4848
$ pip install alerta-server alerta
49-
$ alertad
49+
$ alertad run
5050

5151
To install the web console run::
5252

@@ -89,7 +89,7 @@ License
8989
-------
9090

9191
Alerta monitoring system and console
92-
Copyright 2012-2016 Guardian News & Media
92+
Copyright 2012-2017 Guardian News & Media
9393

9494
Licensed under the Apache License, Version 2.0 (the "License");
9595
you may not use this file except in compliance with the License.

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.10.1
1+
5.0.0-alpha1

‎alerta-server.spec

-101
This file was deleted.

‎alerta/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build.py

‎alerta/api.py

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
from alerta.app import create_app
2+
app = create_app()

0 commit comments

Comments
 (0)