mozilla
/
MozDef
зеркало из https://github.com/mozilla/MozDef.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
4 217 коммитов 4 Ветки 53 Теги 68 MiB
Граф коммитов

4217 Коммитов

Автор SHA1 Сообщение Дата
Michal Purzynski d1c1990d88 Correctly propagate the source ip address to the details.sourceipaddress 2019-04-03 15:34:02 -07:00
Michal Purzynski ba33a0c0c0 Merge branch 'master' of https://github.com/mozilla/mozdef 2019-04-03 15:08:50 -07:00
A Smith fb898a2da9
Merge pull request #1192 from mozilla/guardduty_fix_null_date 
Adding check for None type object in date fields.
 2019-04-03 13:47:19 -05:00
Brandon Myers 82ccd492ba
Merge pull request #1200 from mozilla/proxy_fix_tags 
lowercase TAGS in squidFixup.py
 2019-04-02 15:13:30 -05:00
Brandon Myers 32d13f5156
Merge pull request #1201 from gene1wood/fix-deploy-regex 
Fix regex in deploy to match multi digit semver versions
 2019-04-02 13:19:56 -05:00
Phrozyn 12b9e9ef0e
adding tags assertions to tests. 2019-04-02 12:50:19 -05:00
Gene Wood e228a2c87e
Fix regex in deploy to match multi digit semver versions 2019-04-01 16:43:37 -07:00
Brandon Myers c95e5de846
Merge pull request #1197 from mozilla/changelog_1-38-2 
Update changelog for v1.38.2
 2019-04-01 18:11:51 -05:00
Brandon Myers 9e1901b49d
Merge pull request #1199 from gene1wood/fix-deploy-on-tags 
Fix deploy so it triggers on tags
 2019-04-01 15:21:38 -05:00
Phrozyn a43c7ddc1f
lowercase TAGS in squidFixup.py 2019-04-01 15:10:59 -05:00
Gene Wood 78473a4fac
Clarify the log messages to reflect the fact that we don't run the tests in CodeBuild 2019-03-29 22:34:33 -07:00
Gene Wood 8c79459308
Fix deploy so it triggers on tags 
The tag regex was missing the "v" prefix for the tag name
(e.g. "v1.2.3")
Also removing the march_swarm case as it's no longer needed
 2019-03-29 22:34:06 -07:00
Gene Wood 43b29c4876
Add set -e to fail if any step fails 
This will prevent the build from continuing if one of the steps fails,
ensuring that the output from CodeBuild is accurate about success or
failure
 2019-03-29 22:32:23 -07:00
Brandon Myers 84409d2eb9
Merge pull request #1198 from gene1wood/fix-up-deploy 
Fix docker push and tag
 2019-03-29 17:55:44 -05:00
Gene Wood f20e70264f
Fix docker push and tag 
* Only tag an image as latest if it came from master branch
* Upload images to dockerhub tagged as latest in addition to those tagged as the branch
 2019-03-29 15:41:00 -07:00
Brandon Myers 1f00c1fe1d
Update changelog for v1.38.2 2019-03-29 16:27:56 -05:00
Brandon Myers fb0dd457a8
Merge pull request #1196 from mozilla/fix_alertplugin_references 
Fixup remaining alertplugin references in makefile
 2019-03-29 16:23:58 -05:00
Brandon Myers bbde458b4b
Fixup remaining alertplugin references in makefile 2019-03-29 15:42:47 -05:00
Brandon Myers df8bdc52a0
Merge pull request #1195 from gene1wood/update-changelog 
Update CHANGELOG for v1.38.1
 2019-03-29 14:59:23 -05:00
Gene Wood d45096c012
Update CHANGELOG for v1.38.1 2019-03-29 12:46:22 -07:00
Brandon Myers ce0216d70a
Merge pull request #1186 from gene1wood/march_swarm 
Prep MozDef for AWS Marketplace
 2019-03-29 14:06:29 -05:00
Gene Wood dad1af79c5
Revert bugfix for weekly alias always being created 
This reverts part of f7e1a9bacb
because it's causing the error below. Once we figure out the cause we'll
reintroduce this bugfix. This leaves the new get_aliases method in mozdef_util
in place as it's fine (though we're not actually calling it for some reason)

```
Connecting to http://elasticsearch:9200
Traceback (most recent call last):
 File "initial_setup.py", line 61, in <module>
   'events,events-previous,alerts,events-weekly')
 File "/opt/mozdef/envs/python/lib/python2.7/site-packages/elasticsearch/client/utils.py", line 73, in _wrapped
   return func(*args, params=params, **kwargs)
 File "/opt/mozdef/envs/python/lib/python2.7/site-packages/elasticsearch/client/indices.py", line 399, in get_alias
   '_alias', name), params=params)
 File "/opt/mozdef/envs/python/lib/python2.7/site-packages/elasticsearch/transport.py", line 312, in perform_request
   status, headers, data = connection.perform_request(method, url, params, body, ignore=ignore, timeout=timeout)
 File "/opt/mozdef/envs/python/lib/python2.7/site-packages/elasticsearch/connection/http_urllib3.py", line 129, in perform_request
   self._raise_error(response.status, raw_data)
 File "/opt/mozdef/envs/python/lib/python2.7/site-packages/elasticsearch/connection/base.py", line 125, in _raise_error
   raise HTTP_EXCEPTIONS.get(status_code, TransportError)(status_code, error_message, additional_info)
elasticsearch.exceptions.NotFoundError: TransportError(404, u'index_not_found_exception', u'no such index')
```
 2019-03-29 11:23:18 -07:00
Brandon Myers 35e9c0d4dc
Modify requirements to use mozdef-util version 1.0.6 2019-03-29 12:53:44 -05:00
Brandon Myers c4f553d207
Bump mozdef-util version to 1.0.6 2019-03-29 12:52:33 -05:00
Brandon Myers efcc7fe3c6
Merge pull request #1191 from mozilla/release_1-38-changelog 
Update changelog for version 1.38
 2019-03-29 09:45:52 -05:00
Phrozyn 87b23c19d6
fixing conditional syntax 2019-03-28 19:20:04 -05:00
Phrozyn 5a82201040
Adding check for None type object in date fields. 2019-03-28 18:09:03 -05:00
Brandon Myers 895baa408d
Merge pull request #1188 from Mozilla-GitHub-Standards/master 
Add Mozilla Code of Conduct
 2019-03-28 17:33:05 -05:00
Brandon Myers ae5aeaa53d
Update changelog for version 1.38 2019-03-28 14:15:09 -05:00
Gene Wood 1669fea708
Merge remote-tracking branch 'upstream/march_swarm' into march_swarm 2019-03-28 10:24:03 -07:00
Gene Wood 01aa646de3
Merge pull request #1184 from gene1wood/make-bootstrap-kibana-version-independent 
Remove need to hard code kibana version in bootstrap
 2019-03-28 10:23:27 -07:00
Mozilla-GitHub-Standards 576eae4a0e Add Mozilla Code of Conduct file 
Fixes #1187.

_(Message COC002)_
 2019-03-27 21:24:28 -07:00
Gene Wood 3ea1563122
Merge branch 'master' into march_swarm 
# Conflicts:
#	docker/compose/docker-compose-cloudy-mozdef.yml
 2019-03-26 14:52:37 -07:00
Gene Wood cf77a21b82
Limit crond logging 2019-03-26 14:44:44 -07:00
Gene Wood ff603be2e3
Remove need to hard code kibana version in bootstrap 
Instead this calls the kibana API and sets the defaultIndex
 2019-03-26 14:31:42 -07:00
Gene Wood f7e1a9bacb
Fix bug where weekly alias is always created 2019-03-26 14:26:50 -07:00
Gene Wood 49b34d9270
Use kibana_index_name instead of hardcoded value 2019-03-26 14:26:08 -07:00
Gene Wood 199377a095
Fix typo'd example text 2019-03-26 14:19:20 -07:00
Gene Wood 1af5149116
Merge pull request #1176 from gene1wood/improve-makefile-phony-lines 
Fix missing and grouped Makefile phony lines
 2019-03-25 11:03:00 -07:00
Gene Wood 8c65a04605
Fix missing and grouped Makefile phony lines 2019-03-25 08:05:12 -07:00
Gene Wood d0a850d56b
Merge pull request #1172 from gene1wood/march_swarm 
Fix missing env files for pull and grow packer build volume
 2019-03-22 22:16:16 -07:00
Gene Wood 4bd78fee32
Fix missing env files for pull 2019-03-22 22:13:31 -07:00
Gene Wood 5322769a77
Merge pull request #1171 from gene1wood/march_swarm 
March swarm
 2019-03-22 18:43:16 -07:00
Gene Wood 326bfd4b2c
Fix error when pulling docker images 
This addresses error `Couldn't find env file: /opt/mozdef/docker/compose/cloudy_mozdef.env`
 2019-03-22 18:41:37 -07:00
Gene Wood 1f6520249a
Output the git hash that's being built in the logs to help in troubleshooting 2019-03-22 18:40:36 -07:00
Gene Wood c0b331b82f
Merge pull request #1170 from gene1wood/march_swarm 
Revert attempts to improve sed command
 2019-03-22 16:55:01 -07:00
Gene Wood 380f87bd8d
Remove wget progress output during CodeBuild build 2019-03-22 16:53:42 -07:00
Gene Wood 30b8cf24d5
Revert attempts to improve sed command 
This reverts my efforts to fix #1163 where I tried improving the
sed line that modifies the compose file
* #1165
* #1168

I opened issue #1169 to explore solving this further
 2019-03-22 16:52:47 -07:00
Gene Wood 9f86ebe1ad
Merge pull request #1168 from gene1wood/march_swarm 
Fix sed line issue with make intepreting dollar sign
 2019-03-22 15:36:43 -07:00
Gene Wood e21231c11e
Fix sed line issue with make intepreting dollar sign 2019-03-22 15:34:39 -07:00