metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmerri...@apache.org
Subject [18/51] [abbrv] metron git commit: Merge branch 'master' into feature/METRON-1554-pcap-query-panel
Date Fri, 17 Aug 2018 15:34:33 GMT
Merge branch 'master' into feature/METRON-1554-pcap-query-panel


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/7dff4def
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/7dff4def
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/7dff4def

Branch: refs/heads/master
Commit: 7dff4def23a7c839ea599a120ab6d4cf5b9bbbef
Parents: 6c90724 ccdbeff
Author: cstella <cestella@gmail.com>
Authored: Thu Jul 26 12:29:04 2018 -0400
Committer: cstella <cestella@gmail.com>
Committed: Thu Jul 26 12:29:04 2018 -0400

----------------------------------------------------------------------
 .../docker/rpm-docker/SPECS/metron.spec         |   1 +
 .../e2e/utils/clean_metron_update_table.ts      |  18 ++
 .../metron-alerts/e2e/utils/e2e_util.ts         |  20 +-
 .../alert-filters.component.spec.ts             |  18 ++
 .../alert-filters/alert-filters.component.ts    |  20 +-
 .../table-view/table-view.component.spec.ts     |  18 ++
 .../tree-view/tree-view.component.spec.ts       |  18 ++
 .../alerts/meta-alerts/meta-alerts.module.ts    |  18 ++
 .../date-picker/date-picker.component.spec.ts   |  18 ++
 .../shared/date-picker/date-picker.component.ts |  18 ++
 .../shared/date-picker/date-picker.module.ts    |  18 ++
 .../alert-severity-hexagon.directive.spec.ts    |  18 ++
 .../app/shared/group-by/group-by.component.ts   |  18 ++
 .../metron-alerts/src/app/shared/index.ts       |  18 ++
 .../src/app/shared/pipes/map-keys.pipe.spec.ts  |  18 ++
 .../src/app/shared/pipes/map-keys.pipe.ts       |  18 ++
 .../src/app/shared/pipes/time-lapse.pipe.ts     |  18 ++
 .../time-range/time-range.component.spec.ts     |  18 ++
 .../app/shared/time-range/time-range.module.ts  |  18 ++
 metron-interface/metron-alerts/src/polyfills.ts |  18 ++
 .../metron-config/e2e/utils/e2e_util.ts         |  18 ++
 .../src/app/app.config.interface.ts             |  18 ++
 .../metron-config/src/app/app.config.ts         |  18 ++
 .../sensor-grok/sensor-grok.component.ts        |  18 ++
 .../sensor-parser-config-readonly/index.ts      |  18 ++
 .../app/sensors/sensor-parser-config/index.ts   |  18 ++
 .../shared/ace-editor/ace-editor.component.ts   |  18 ++
 .../app/shared/ace-editor/ace-editor.module.ts  |  18 ++
 .../advanced-config-form.module.ts              |  18 ++
 .../src/app/shared/metron-modal/index.ts        |  18 ++
 .../shared/metron-table/metron-sorter/index.ts  |  18 ++
 .../metron-sorter.component.spec.ts             |  18 ++
 .../metron-sorter/metron-sorter.component.ts    |  18 ++
 .../shared/metron-table/metron-table.module.ts  |  18 ++
 .../src/app/shared/multiple-input/index.ts      |  18 ++
 .../multiple-input/multiple-input.module.ts     |  18 ++
 .../src/app/shared/number-spinner/index.ts      |  18 ++
 .../number-spinner/number-spinner.module.ts     |  18 ++
 .../shared/sample-data/sample-data.module.ts    |  18 ++
 .../src/environments/environment.prod.ts        |  18 ++
 .../src/environments/environment.ts             |  18 ++
 metron-interface/metron-rest/README.md          |  12 +-
 .../parsed/jsonMapExampleParsed                 |   6 +
 .../raw/jsonMapExampleOutput                    |   3 +
 metron-platform/metron-parsers/README.md        |   5 +
 .../zookeeper/parsers/jsonMapWrappedQuery.json  |   5 +
 .../metron/parsers/json/JSONMapParser.java      |  40 +++-
 .../JSONMapWrappedQueryIntegrationTest.java     |  37 ++++
 .../integration/ParserIntegrationTest.java      |  22 +-
 .../json/JSONMapParserWrappedQueryTest.java     | 199 +++++++++++++++++++
 pom.xml                                         |  19 +-
 51 files changed, 1044 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metron/blob/7dff4def/metron-deployment/packaging/docker/rpm-docker/SPECS/metron.spec
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/metron/blob/7dff4def/metron-interface/metron-rest/README.md
----------------------------------------------------------------------
diff --cc metron-interface/metron-rest/README.md
index 2d9a535,caa9c78..68ec559
--- a/metron-interface/metron-rest/README.md
+++ b/metron-interface/metron-rest/README.md
@@@ -253,15 -242,8 +253,15 @@@ Request and Response objects are JSON f
  | [ `GET /api/v1/metaalert/add/alert`](#get-apiv1metaalertaddalert)|
  | [ `GET /api/v1/metaalert/remove/alert`](#get-apiv1metaalertremovealert)|
  | [ `GET /api/v1/metaalert/update/status/{guid}/{status}`](#get-apiv1metaalertupdatestatusguidstatus)|
 +| [ `POST /api/v1/pcap/fixed`](#post-apiv1pcapfixed)|
 +| [ `POST /api/v1/pcap/query`](#post-apiv1pcapquery)|
 +| [ `GET /api/v1/pcap`](#get-apiv1pcap)|
 +| [ `GET /api/v1/pcap/{jobId}`](#get-apiv1pcapjobid)|
 +| [ `GET /api/v1/pcap/{jobId}/pdml`](#get-apiv1pcapjobidpdml)|
 +| [ `GET /api/v1/pcap/{jobId}/raw`](#get-apiv1pcapjobidraw)|
 +| [ `GET /api/v1/search/search`](#get-apiv1searchsearch)|
- | [ `POST /api/v1/search/search`](#get-apiv1searchsearch)|
- | [ `POST /api/v1/search/group`](#get-apiv1searchgroup)|
+ | [ `POST /api/v1/search/search`](#post-apiv1searchsearch)|
+ | [ `POST /api/v1/search/group`](#post-apiv1searchgroup)|
  | [ `GET /api/v1/search/findOne`](#get-apiv1searchfindone)|
  | [ `GET /api/v1/search/column/metadata`](#get-apiv1searchcolumnmetadata)|
  | [ `GET /api/v1/sensor/enrichment/config`](#get-apiv1sensorenrichmentconfig)|


Mime
View raw message