You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spot.apache.org by na...@apache.org on 2018/03/19 19:28:51 UTC
[42/42] incubator-spot git commit: fixing merge conflicts
master-->SPOT-181_ODM
fixing merge conflicts master-->SPOT-181_ODM
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/ee4e17d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/ee4e17d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/ee4e17d7
Branch: refs/heads/SPOT-181_ODM
Commit: ee4e17d7e6961e8df18dada10d154bdb9f8bf259
Parents: 14dbd51 0e3ef34
Author: natedogs911 <na...@gmail.com>
Authored: Mon Mar 19 12:26:29 2018 -0700
Committer: natedogs911 <na...@gmail.com>
Committed: Mon Mar 19 12:26:29 2018 -0700
----------------------------------------------------------------------
docs/open-data-model.md | 3310 ++++++++++++++++++
spot-gen/README.md | 66 +
spot-gen/conf/asa.yaml | 33 +
spot-gen/conf/asa/asa.sample | 13 +
.../conf/asa/not-supported-by-parser.sample | 40 +
spot-gen/conf/common/files.txt | 2 +
spot-gen/conf/common/hosts.txt | 5 +
spot-gen/conf/common/subjects.txt | 14 +
spot-gen/conf/common/users.txt | 5 +
spot-gen/conf/common/users_info.txt | 5 +
spot-gen/conf/common/utils.py | 36 +
spot-gen/conf/example.yaml | 35 +
spot-gen/conf/example/domains.txt | 2 +
spot-gen/conf/example/events1.txt | 2 +
spot-gen/conf/example/utils.py | 19 +
spot-gen/conf/unix.yaml | 14 +
spot-gen/conf/unix/unix_events.sample | 4 +
spot-gen/conf/windows_nxlog.yaml | 42 +
.../conf/windows_nxlog/windows_nxlog.sample | 25 +
spot-gen/datagen.py | 227 ++
spot-ingest/streamsets/README.md | 27 +
.../ODMCentrifyIdentityPlatformEventTCP.json | 1096 ++++++
spot-ingest/streamsets/images/ImportContext.png | Bin 0 -> 61789 bytes
.../streamsets/images/ImportPipeline.png | Bin 0 -> 65915 bytes
.../streamsets/netflow/NetFlowODMandLegacy.json | 1463 ++++++++
.../qualys/ODMQualysVulnerabilityContext.json | 1276 +++++++
.../qualys/ODMQualysVulnerabilityEvents.json | 1245 +++++++
.../streamsets/windows/ODMWindowsEventLogs.json | 943 +++++
.../streamsets/windows/WindowsHTTPEdge.json | 603 ++++
spot-ml/ml_ops.sh | 9 +-
.../org/apache/spot/SuspiciousConnects.scala | 20 +-
.../spot/SuspiciousConnectsArgumentParser.scala | 36 +-
.../utilities/data/InputOutputDataHandler.scala | 10 +-
.../SuspiciousConnectsArgumentParserTest.scala | 121 +-
spot-oa/api/graphql/webapp.py | 5 +
spot-oa/arcadia/README.md | 84 +
spot-oa/arcadia/spot_app.json | 1 +
spot-oa/requirements.txt | 1 +
spot-setup/README.md | 5 +
spot-setup/create_email_parquet.hql | 31 +
spot-setup/create_wgdhcp_parquet.hql | 24 +
spot-setup/create_wgtraffic_parquet.hql | 51 +
spot-setup/create_windows_parquet.hql | 45 +
spot-setup/odm/README.md | 68 +
spot-setup/odm/create_endpoint_context_avro.sql | 58 +
spot-setup/odm/create_endpoint_context_pqt.sql | 57 +
spot-setup/odm/create_event_avro.sql | 302 ++
spot-setup/odm/create_event_pqt.sql | 301 ++
spot-setup/odm/create_network_context_avro.sql | 48 +
spot-setup/odm/create_network_context_pqt.sql | 47 +
.../create_threat_intelligence_context_avro.sql | 76 +
.../create_threat_intelligence_context_pqt.sql | 75 +
spot-setup/odm/create_user_context_avro.sql | 51 +
spot-setup/odm/create_user_context_pqt.sql | 50 +
.../odm/create_vulnerability_context_avro.sql | 32 +
.../odm/create_vulnerability_context_pqt.sql | 31 +
spot-setup/odm/endpoint_context.avsc | 44 +
spot-setup/odm/event.avsc | 266 ++
spot-setup/odm/network_context.avsc | 34 +
spot-setup/odm/odm_setup.sh | 197 ++
spot-setup/odm/threat_intelligence_context.avsc | 62 +
spot-setup/odm/user_context.avsc | 37 +
spot-setup/odm/vulnerability_context.avsc | 18 +
spot-setup/spot.conf | 36 +-
.../views/hive/AdministrationActivity.sql | 131 +
.../views/hive/FileObjectAccessedOrChanged.sql | 118 +
spot-setup/views/hive/MessageEvent.sql | 77 +
spot-setup/views/hive/NetworkConnection.sql | 86 +
spot-setup/views/hive/PasswordChangeOrReset.sql | 45 +
.../views/hive/ProcessStartupOrShutdown.sql | 87 +
.../hive/SecurityObjectAccessedOrChanged.sql | 119 +
spot-setup/views/hive/UseOfPrivilegeCommand.sql | 89 +
.../views/hive/UserAccountAddedOrRemoved.sql | 102 +
spot-setup/views/hive/UserLogin.sql | 89 +
74 files changed, 13802 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/ee4e17d7/spot-ml/ml_ops.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/ee4e17d7/spot-oa/requirements.txt
----------------------------------------------------------------------
diff --cc spot-oa/requirements.txt
index 2596e64,5461aae..2339c05
--- a/spot-oa/requirements.txt
+++ b/spot-oa/requirements.txt
@@@ -16,7 -16,8 +16,8 @@@ ipython == 3.2.
# GraphQL API dependencies
flask
flask-graphql
+ flask-cors
-graphql-core
+graphql-core == 1.1.0
urllib3
# API Resources
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/ee4e17d7/spot-setup/README.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/ee4e17d7/spot-setup/spot.conf
----------------------------------------------------------------------
diff --cc spot-setup/spot.conf
index aa08ea7,407e38f..6b3df85
--- a/spot-setup/spot.conf
+++ b/spot-setup/spot.conf
@@@ -84,3 -80,15 +80,15 @@@ PRECISION='64
TOL='1e-6'
TOPIC_COUNT=20
DUPFACTOR=1000
+
+ # API CORS Options
+ #
+ # ACCESS_CONTROL_ALLOW_ORIGIN:
+ # Configuration type: string or comma seperated list
+ #
+ # Examples:
+ # '*' = Allow any origin (Default)
+ # 'http://trustedresource.com' = Allow specific origin
+ # 'http://trustedresource.com,http://anothertrustedresource.com' = Allow multiple origins
+ #
-ACCESS_CONTROL_ALLOW_ORIGIN='*'
++ACCESS_CONTROL_ALLOW_ORIGIN='*'