You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by sa...@apache.org on 2019/11/20 14:37:42 UTC
[metron] 01/01: METRON-2318 Merge master into feature branch
(sardell) closes apache/metron#1563
This is an automated email from the ASF dual-hosted git repository.
sardell pushed a commit to branch feature/METRON-1856-parser-aggregation
in repository https://gitbox.apache.org/repos/asf/metron.git
View the commit online:
https://github.com/apache/metron/commit/661391fdd47bf8928e46bf12a30cdf088411620d
commit 661391fdd47bf8928e46bf12a30cdf088411620d
Merge: 7333300 fca9ebf
Author: Shane Ardell <sh...@gmail.com>
AuthorDate: Mon Nov 18 09:54:07 2019 -0600
METRON-2318 Merge master into feature branch (sardell) closes apache/metron#1563
Upgrade_steps.md | 40 +
metron-analytics/metron-maas-service/README.md | 209 ++++-
metron-analytics/metron-profiler-common/README.md | 10 +-
.../src/main/config/batch-profiler.properties | 2 +-
.../metron/profiler/spark/BatchProfiler.java | 4 +-
.../spark/BatchProfilerIntegrationTest.java | 29 +-
metron-deployment/development/centos6/README.md | 7 +-
.../packaging/docker/rpm-docker/SPECS/metron.spec | 1 +
.../metron-alerts/cypress/fixtures/search-1.1.json | 102 +++
.../metron-alerts/cypress/fixtures/search-1.2.json | 102 +++
.../search/auto-polling.feature.spec.js | 98 +++
.../alerts/alerts-list/alerts-list.component.html | 52 +-
.../alerts/alerts-list/alerts-list.component.scss | 21 -
.../alerts-list/alerts-list.component.spec.ts | 493 +++++++++--
.../alerts/alerts-list/alerts-list.component.ts | 252 +++---
.../app/alerts/alerts-list/alerts-list.module.ts | 12 +-
.../auto-polling/auto-polling.component.html} | 19 +-
.../auto-polling.component.scss} | 59 +-
.../auto-polling/auto-polling.component.spec.ts | 80 ++
.../auto-polling/auto-polling.component.ts} | 29 +-
.../auto-polling/auto-polling.service.spec.ts | 530 ++++++++++++
.../auto-polling/auto-polling.service.ts | 186 +++++
.../app/alerts/alerts-list/query-builder.spec.ts | 124 ++-
.../src/app/alerts/alerts-list/query-builder.ts | 74 +-
.../table-view/table-view.component.html | 7 +
.../table-view/table-view.component.scss | 17 +
.../alerts-list/tree-view/tree-view.component.ts | 1 -
.../configure-rows/configure-rows.component.html | 34 +-
.../configure-rows/configure-rows.component.ts | 76 +-
.../show-hide-alert-entries.component.spec.ts | 43 +-
.../show-hide/show-hide-alert-entries.component.ts | 36 +-
.../show-hide/show-hide.service.spec.ts | 12 +-
.../configure-rows/show-hide/show-hide.service.ts | 6 +-
.../metron-alerts/src/app/model/search-response.ts | 2 +-
.../metron-alerts/src/app/model/table-metadata.ts | 10 +-
.../app/service/elasticsearch-localstorage-impl.ts | 6 +-
.../src/app/service/search.service.spec.ts | 78 ++
.../src/app/service/search.service.ts | 26 +-
.../shared/directives/alert-search.directive.ts | 118 +--
.../modal-loading-indicator.component.html} | 17 +-
.../modal-loading-indicator.component.scss} | 27 +-
.../modal-loading-indicator.component.spec.ts} | 38 +-
.../modal-loading-indicator.component.ts | 29 +
.../src/app/shared/switch/switch.component.html | 4 +-
.../src/app/shared/switch/switch.component.scss | 9 +
.../src/app/shared/switch/switch.component.ts | 1 +
.../metron-alerts/src/app/utils/constants.ts | 2 +-
.../metron-alerts/src/app/utils/httpUtil.ts | 20 +-
metron-interface/metron-config/package-lock.json | 927 +++++++++++----------
.../src/app/model/sensor-parser-config.ts} | 42 +-
.../src/app/sensors/reducers/index.ts | 0
.../sensor-parser-config.component.ts | 8 +-
metron-interface/metron-rest/pom.xml | 22 +-
metron-platform/metron-common/README.md | 30 +
.../src/main/scripts/upgrade_helper.sh | 120 +++
.../src/main/scripts/flatfile_loader.sh | 7 +-
.../src/main/scripts/flatfile_summarizer.sh | 2 +
.../metron-elasticsearch-storm/pom.xml | 11 +
.../metron-indexing/metron-indexing-storm/pom.xml | 23 +-
metron-platform/metron-pcap-backend/pom.xml | 3 +-
.../metron-solr/metron-solr-storm/pom.xml | 6 +
site/community/index.md | 2 +-
62 files changed, 3318 insertions(+), 1039 deletions(-)
diff --cc metron-deployment/development/centos6/README.md
index a00c5cb,62b4aa4..8d7ebdc
--- a/metron-deployment/development/centos6/README.md
+++ b/metron-deployment/development/centos6/README.md
@@@ -98,8 -98,8 +98,7 @@@ Any platform that supports these tools
env ANSIBLE_ARGS=' -vvvv' vagrant up
```
As this can produce large amounts of logging, it is best to redirect output to a file for later analysis.
-
-
### Explore Metron
Navigate to the following resources to explore your newly minted Apache Metron environment.
diff --cc metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
index 2cd34a5,1bb7a04..57e0b40
mode 100644,100755..100755
--- a/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
+++ b/metron-interface/metron-alerts/src/app/alerts/alerts-list/alerts-list.component.ts
@@@ -562,11 -568,7 +568,7 @@@ export class AlertsListComponent implem
}
queryForTreeView() {
- if (!this.hideQueryBuilder) {
- return this.queryBuilder.generateSelect();
- } else {
- return this.manualQuery.nativeElement.value;
- }
+ return this.queryBuilder.query;
}
--}
++}
diff --cc metron-interface/metron-config/package-lock.json
index 3213396,342c5fa..5ba7ff6
--- a/metron-interface/metron-config/package-lock.json
+++ b/metron-interface/metron-config/package-lock.json
@@@ -562,25 -579,25 +579,29 @@@
"dependencies": {
"abbrev": {
"version": "1.1.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
++ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true,
"optional": true
},
"ansi-regex": {
"version": "2.1.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
++ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
++ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.5",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
++ "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"dev": true,
"optional": true,
"requires": {
@@@ -590,13 -607,13 +611,15 @@@
},
"balanced-match": {
"version": "1.0.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
++ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
++ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"optional": true,
"requires": {
@@@ -606,37 -623,37 +629,43 @@@
},
"chownr": {
"version": "1.1.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
++ "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
"dev": true,
"optional": true
},
"code-point-at": {
"version": "1.1.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
++ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
++ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
++ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
++ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true,
"optional": true
},
"debug": {
"version": "4.1.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
++ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"dev": true,
"optional": true,
"requires": {
@@@ -645,25 -662,25 +674,29 @@@
},
"deep-extend": {
"version": "0.6.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
++ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
"dev": true,
"optional": true
},
"delegates": {
"version": "1.0.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
++ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"dev": true,
"optional": true
},
"detect-libc": {
"version": "1.0.3",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
++ "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
"dev": true,
"optional": true
},
"fs-minipass": {
"version": "1.2.5",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
++ "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
"dev": true,
"optional": true,
"requires": {
@@@ -672,13 -689,13 +705,15 @@@
},
"fs.realpath": {
"version": "1.0.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
++ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true,
"optional": true
},
"gauge": {
"version": "2.7.4",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
++ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"dev": true,
"optional": true,
"requires": {
@@@ -694,7 -711,7 +729,8 @@@
},
"glob": {
"version": "7.1.3",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
++ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"optional": true,
"requires": {
@@@ -708,13 -725,13 +744,15 @@@
},
"has-unicode": {
"version": "2.0.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
++ "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"dev": true,
"optional": true
},
"iconv-lite": {
"version": "0.4.24",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
++ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"optional": true,
"requires": {
@@@ -723,7 -740,7 +761,8 @@@
},
"ignore-walk": {
"version": "3.0.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
++ "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
"dev": true,
"optional": true,
"requires": {
@@@ -732,7 -749,7 +771,8 @@@
},
"inflight": {
"version": "1.0.6",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
++ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"optional": true,
"requires": {
@@@ -742,19 -759,19 +782,22 @@@
},
"inherits": {
"version": "2.0.3",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
++ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
++ "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"dev": true,
"optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
++ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"optional": true,
"requires": {
@@@ -763,13 -780,13 +806,15 @@@
},
"isarray": {
"version": "1.0.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
++ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true,
"optional": true
},
"minimatch": {
"version": "3.0.4",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
++ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"optional": true,
"requires": {
@@@ -778,13 -795,13 +823,15 @@@
},
"minimist": {
"version": "0.0.8",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
++ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
++ "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
"dev": true,
"optional": true,
"requires": {
@@@ -794,7 -811,7 +841,8 @@@
},
"minizlib": {
"version": "1.2.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
++ "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
"dev": true,
"optional": true,
"requires": {
@@@ -803,7 -820,7 +851,8 @@@
},
"mkdirp": {
"version": "0.5.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
++ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"optional": true,
"requires": {
@@@ -812,13 -829,13 +861,15 @@@
},
"ms": {
"version": "2.1.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
++ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true,
"optional": true
},
"needle": {
"version": "2.3.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
++ "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
"dev": true,
"optional": true,
"requires": {
@@@ -829,7 -846,7 +880,8 @@@
},
"node-pre-gyp": {
"version": "0.12.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
++ "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
"dev": true,
"optional": true,
"requires": {
@@@ -847,7 -864,7 +899,8 @@@
},
"nopt": {
"version": "4.0.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
++ "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"dev": true,
"optional": true,
"requires": {
@@@ -857,13 -874,13 +910,15 @@@
},
"npm-bundled": {
"version": "1.0.6",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
++ "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
++ "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
"dev": true,
"optional": true,
"requires": {
@@@ -873,7 -890,7 +928,8 @@@
},
"npmlog": {
"version": "4.1.2",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
++ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"dev": true,
"optional": true,
"requires": {
@@@ -885,19 -902,19 +941,22 @@@
},
"number-is-nan": {
"version": "1.0.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
++ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
++ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true,
"optional": true
},
"once": {
"version": "1.4.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
++ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"optional": true,
"requires": {
@@@ -906,19 -923,19 +965,22 @@@
},
"os-homedir": {
"version": "1.0.2",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
++ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
"dev": true,
"optional": true
},
"os-tmpdir": {
"version": "1.0.2",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
++ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true,
"optional": true
},
"osenv": {
"version": "0.1.5",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
++ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
"dev": true,
"optional": true,
"requires": {
@@@ -928,19 -945,19 +990,22 @@@
},
"path-is-absolute": {
"version": "1.0.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
++ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true,
"optional": true
},
"process-nextick-args": {
"version": "2.0.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
++ "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
"dev": true,
"optional": true
},
"rc": {
"version": "1.2.8",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
++ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
"dev": true,
"optional": true,
"requires": {
@@@ -952,7 -969,7 +1017,8 @@@
"dependencies": {
"minimist": {
"version": "1.2.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
++ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true,
"optional": true
}
@@@ -960,7 -977,7 +1026,8 @@@
},
"readable-stream": {
"version": "2.3.6",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
++ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"optional": true,
"requires": {
@@@ -975,7 -992,7 +1042,8 @@@
},
"rimraf": {
"version": "2.6.3",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
++ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"dev": true,
"optional": true,
"requires": {
@@@ -984,43 -1001,43 +1052,50 @@@
},
"safe-buffer": {
"version": "5.1.2",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
++ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
++ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"dev": true,
"optional": true
},
"sax": {
"version": "1.2.4",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
++ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
"dev": true,
"optional": true
},
"semver": {
"version": "5.7.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
++ "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
"dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
++ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
"dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
++ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true,
"optional": true
},
"string-width": {
"version": "1.0.2",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
++ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"optional": true,
"requires": {
@@@ -1031,7 -1048,7 +1106,8 @@@
},
"string_decoder": {
"version": "1.1.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
++ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"optional": true,
"requires": {
@@@ -1040,7 -1057,7 +1116,8 @@@
},
"strip-ansi": {
"version": "3.0.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
++ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"optional": true,
"requires": {
@@@ -1049,13 -1066,13 +1126,15 @@@
},
"strip-json-comments": {
"version": "2.0.1",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
++ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
"dev": true,
"optional": true
},
"tar": {
"version": "4.4.8",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
++ "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
"dev": true,
"optional": true,
"requires": {
@@@ -1070,13 -1087,13 +1149,15 @@@
},
"util-deprecate": {
"version": "1.0.2",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
++ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"dev": true,
"optional": true
},
"wide-align": {
"version": "1.1.3",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
++ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"dev": true,
"optional": true,
"requires": {
@@@ -1085,13 -1102,13 +1166,15 @@@
},
"wrappy": {
"version": "1.0.2",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
++ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.3",
-- "bundled": true,
++ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
++ "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
"dev": true,
"optional": true
}
@@@ -3643,25 -3646,11 +3720,17 @@@
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
},
"deep-equal": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz",
- "integrity": "sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==",
- "dev": true,
- "requires": {
- "is-arguments": "^1.0.4",
- "is-date-object": "^1.0.1",
- "is-regex": "^1.0.4",
- "object-is": "^1.0.1",
- "object-keys": "^1.1.1",
- "regexp.prototype.flags": "^1.2.0"
- }
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+ "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+ "dev": true
},
+ "deep-freeze-strict": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/deep-freeze-strict/-/deep-freeze-strict-1.1.1.tgz",
+ "integrity": "sha1-d9BYPKJKab5LvZrC+uQV1VUj5bA=",
+ "dev": true
+ },
"default-gateway": {
"version": "2.7.2",
"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz",
@@@ -5028,6 -5008,6 +5088,11 @@@
"concat-map": "0.0.1"
}
},
++ "chownr": {
++ "version": "1.0.1",
++ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
++ "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
++ },
"code-point-at": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@@ -5079,6 -5059,6 +5144,15 @@@
"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
"optional": true
},
++ "fs-minipass": {
++ "version": "1.2.5",
++ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
++ "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
++ "optional": true,
++ "requires": {
++ "minipass": "^2.2.1"
++ }
++ },
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@@ -5191,6 -5171,6 +5265,23 @@@
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"optional": true
},
++ "minipass": {
++ "version": "2.2.4",
++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
++ "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
++ "requires": {
++ "safe-buffer": "^5.1.1",
++ "yallist": "^3.0.0"
++ }
++ },
++ "minizlib": {
++ "version": "1.1.0",
++ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
++ "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
++ "requires": {
++ "minipass": "^2.2.1"
++ }
++ },
"mkdirp": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@@ -5375,8 -5355,8 +5466,7 @@@
"safe-buffer": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-- "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-- "optional": true
++ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
},
"safer-buffer": {
"version": "2.1.2",
@@@ -5458,6 -5438,6 +5548,31 @@@
"yallist": "^3.0.3"
},
"dependencies": {
++ "chownr": {
++ "version": "1.1.3",
++ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
++ "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
++ "optional": true
++ },
++ "minipass": {
++ "version": "2.9.0",
++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
++ "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
++ "optional": true,
++ "requires": {
++ "safe-buffer": "^5.1.2",
++ "yallist": "^3.0.0"
++ }
++ },
++ "minizlib": {
++ "version": "1.3.3",
++ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
++ "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
++ "optional": true,
++ "requires": {
++ "minipass": "^2.9.0"
++ }
++ },
"safe-buffer": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
@@@ -5490,8 -5470,8 +5605,7 @@@
"yallist": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-- "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-- "optional": true
++ "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
}
}
},
@@@ -10129,11 -9988,22 +10173,11 @@@
}
},
"shallow-clone": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.0.tgz",
- "integrity": "sha512-Drg+nOI+ofeuslBf0nulyWLZhK1BZprqNvPJaiB4VvES+9gC6GG+qOVAfuO12zVSgxq9SKevcme7S3uDT6Be8w==",
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
- "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
- "dev": true,
++ "version": "3.0.1",
++ "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
++ "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
"requires": {
- "is-extendable": "^0.1.1",
- "kind-of": "^5.0.0",
- "mixin-object": "^2.0.1"
- },
- "dependencies": {
- "kind-of": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true
- }
+ "kind-of": "^6.0.2"
}
},
"shebang-command": {
diff --cc metron-interface/metron-config/src/app/sensors/reducers/index.ts
index fcf50d6,c17939a..fcf50d6
mode 100644,100644..100755
--- a/metron-interface/metron-config/src/app/sensors/reducers/index.ts
+++ b/metron-interface/metron-config/src/app/sensors/reducers/index.ts
diff --cc metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.ts
index ef9ea16,31ef9c0..9c0e3a2
--- a/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.ts
+++ b/metron-interface/metron-config/src/app/sensors/sensor-parser-config/sensor-parser-config.component.ts
@@@ -490,14 -468,8 +490,8 @@@ export class SensorParserConfigComponen
);
}
- isGrokParser(sensorParserConfig: SensorParserConfig): boolean {
+ isGrokParser(sensorParserConfig: ParserConfigModel): boolean {
- if (sensorParserConfig && sensorParserConfig.parserClassName) {
- return (
- sensorParserConfig && sensorParserConfig.parserClassName ===
- 'org.apache.metron.parsers.GrokParser'
- );
- }
- return false;
+ return sensorParserConfig && sensorParserConfig.parserClassName === 'org.apache.metron.parsers.GrokParser';
}
getTransformationCount(): number {
diff --cc metron-interface/metron-rest/pom.xml
index 66dd99e,b4ca507..d1a7087
--- a/metron-interface/metron-rest/pom.xml
+++ b/metron-interface/metron-rest/pom.xml
@@@ -1,15 -1,15 +1,15 @@@
<?xml version="1.0" encoding="UTF-8"?>
--<!--
-- Licensed to the Apache Software
-- Foundation (ASF) under one or more contributor license agreements. See the
-- NOTICE file distributed with this work for additional information regarding
-- copyright ownership. The ASF licenses this file to You under the Apache License,
-- Version 2.0 (the "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-- Unless required by applicable law or agreed to in writing, software distributed
-- under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
-- OR CONDITIONS OF ANY KIND, either express or implied. See the License for
-- the specific language governing permissions and limitations under the License.
++<!--
++ Licensed to the Apache Software
++ Foundation (ASF) under one or more contributor license agreements. See the
++ NOTICE file distributed with this work for additional information regarding
++ copyright ownership. The ASF licenses this file to You under the Apache License,
++ Version 2.0 (the "License"); you may not use this file except in compliance
++ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
++ Unless required by applicable law or agreed to in writing, software distributed
++ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
++ OR CONDITIONS OF ANY KIND, either express or implied. See the License for
++ the specific language governing permissions and limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"