Brandon Myers
a9e5958248
Merge branch 'master' into move_tests_dependencies
2017-07-12 19:36:15 -05:00
Brandon Myers
b7974bbce7
Move test requirements to tests directory
2017-07-12 19:35:56 -05:00
Brandon Myers
913fcf6d60
Merge pull request #408 from mozilla/add_moar_pythons
...
Add Python 2.7.12 and 2.7.13 to CI coverage
2017-07-07 15:15:18 -05:00
Jonathan Claudius
b7a89c6f20
Add Python 2.7.12 and 2.7.13 to CI coverage
2017-07-07 16:07:54 -04:00
Brandon Myers
d89fc38f9a
Merge pull request #405 from mozilla/fix_healthAndStatus-fxa.py
...
Remove unused healthAndStatus-fxa.py and fix healthAndStatus-fxa.sh
2017-07-07 13:46:19 -05:00
Jonathan Claudius
f324f7d7cb
Rename conf files
2017-07-07 14:39:28 -04:00
Jonathan Claudius
0f3dc9967c
Revert back to pre-existing conf ref
2017-07-07 14:32:57 -04:00
Jonathan Claudius
d9b760d205
Remove unused healthAndStatus-fxa.py and fix healthAndStatus-fxa.sh
2017-07-07 14:29:41 -04:00
A Smith
68791d20bf
Merge pull request #402 from mozilla/add_travisci_tests
...
Add travisci to project and update unit tests
2017-07-05 17:16:16 -05:00
Brandon Myers
bf465b0480
Remove trailing slash in kibana url
2017-07-05 17:10:18 -05:00
Brandon Myers
a695692382
Correct kibana dashboard url
2017-07-05 17:08:21 -05:00
Brandon Myers
b3c37bae16
Replace mq cred defaults for loginput config
2017-07-05 16:38:04 -05:00
Brandon Myers
95e4d2cd69
Fix loginput and rest unit tests
2017-07-05 16:37:59 -05:00
Brandon Myers
93dbb4ae72
Fix travisci badge references
2017-07-05 16:37:54 -05:00
Brandon Myers
04111482ce
Remove unnecessary counter file
2017-07-05 16:37:48 -05:00
Brandon Myers
ad64804e32
Add travisci to project and stabalize tests
2017-07-05 16:37:41 -05:00
Brandon Myers
c26b2aee29
Merge pull request #401 from mozilla/merge_dockerfile
...
Merge dockerfile with #379
2017-07-03 16:18:04 -05:00
Brandon Myers
51ec5c9738
Fixup github references in dockerfile
2017-07-03 12:57:07 -05:00
cglewis
adfb16e2cc
improvements to dockerfile
...
- update docs to match
- set default cmd so it can run in the background
- combine commands to reduce size (savings of almost 250mb)
- reorder commands to improve caching when building
2017-07-03 10:19:01 -07:00
Brandon Myers
20a8998d39
Merge pull request #400 from tristanweir/filter-bot-alerts
...
Improve logic on which messages will be filtered by the IRC bot
2017-06-28 10:45:22 -07:00
Tristan Weir
169d779070
Fix syntax of if statement
2017-06-28 09:37:32 -07:00
Tristan Weir
ad00e9088e
Improve logic on which messages will be filtered by the IRC bot
...
Fixes the alert logic to ensure that if an IRC channel is specified, the message will be displayed by the bot
2017-06-27 15:54:34 -07:00
A Smith
ed2f6e02c2
Merge pull request #399 from pwnbus/master
...
Update MozDef to use ES v2
2017-06-27 15:30:21 -05:00
Brandon Myers
6c95e30b8d
Merge pull request #8 from pwnbus/remove_travis_file
...
Remove travis yml file
2017-06-27 15:23:25 -05:00
Brandon Myers
41e437a1b7
Remove travis yml file
2017-06-27 13:22:51 -07:00
Brandon Myers
06dbeb12f3
Fix notifymozdefbot logic
2017-06-27 13:18:12 -07:00
Brandon Myers
197788bf26
Add temporary solution for mozdefbot
2017-06-27 13:18:04 -07:00
Brandon Myers
a0be94bfbc
Revert "Remove unnecessary alert plugin"
...
This reverts commit 3653984c11a6570bbf149bc8df5ac4bc6716987a.
2017-06-27 13:17:56 -07:00
Brandon Myers
db56a5bf7f
Remove releng sensitive info description in alert
2017-06-27 13:17:48 -07:00
Brandon Myers
77329ee3d3
Fix return statement indentation
2017-06-27 13:17:41 -07:00
Brandon Myers
36c2f18ea4
Remove unnecessary alert plugin
2017-06-27 13:17:34 -07:00
Brandon Myers
db4c09fae3
Add ircchannel to ssh access alert
2017-06-27 13:17:28 -07:00
Brandon Myers
48ec5095b7
Add logic to auto override notify if ircchannel set
2017-06-27 13:17:22 -07:00
Brandon Myers
95b4b28a08
Allow alerttask to exclude mozdefbot from severity
2017-06-27 13:16:43 -07:00
Brandon Myers
43aebfd492
Allow alerts to set ircchannel
2017-06-27 13:16:34 -07:00
Brandon Myers
0a3bfa2f07
Merge pull request #7 from pwnbus/fixup_example_python_scripts
...
Remove unnecessary pyes import
2017-06-21 11:31:31 -05:00
Brandon Myers
e42517a35c
Remove unnecessary pyes import
2017-06-21 11:30:51 -05:00
Brandon Myers
d2f9d94520
Merge pull request #6 from pwnbus/fix_examples_demo
...
Fix sample data examples
2017-06-21 10:54:04 -05:00
Brandon Myers
4ca0a41c53
Fix sample data examples
2017-06-21 10:53:30 -05:00
Brandon Myers
5ab7f4d449
Merge pull request #5 from pwnbus/remove_pyes_docs
...
Remove pyes from usage documentation
2017-06-19 15:49:44 -05:00
Brandon Myers
69ee0f597a
Remove pyes from usage documentation
2017-06-19 15:49:08 -05:00
Brandon Myers
059715aa42
Merge pull request #4 from pwnbus/modify_git_namespace
...
Change git repo location in docs to mozilla namespace
2017-06-19 15:20:03 -05:00
Brandon Myers
b263a58c50
Change git repo location in docs to mozilla namespace
2017-06-19 15:19:00 -05:00
Brandon Myers
f53d67edf3
Merge pull request #2 from pwnbus/enable_travis
...
Add travis file
2017-06-15 17:29:26 -05:00
Brandon Myers
8b32b632aa
Add travis file
2017-06-15 17:25:06 -05:00
Brandon Myers
0fe9cb67d1
Merge pull request #1 from pwnbus/sync_codebases
...
Sync codebases
2017-06-15 17:16:58 -05:00
Aaron Meihm
88dfd6af24
ssh_lateral: set level to WARNING
2017-06-15 15:17:38 -05:00
Brandon Myers
11ac4dd835
Update files that were diff between two repos
2017-06-15 15:14:57 -05:00
Brandon Myers
63b3cf2194
Remove old leftover files
2017-06-15 15:13:03 -05:00
Brandon Myers
119e89b96b
Sync readme with readme from public repo
2017-06-15 15:07:47 -05:00