You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spot.apache.org by ev...@apache.org on 2017/03/29 16:51:53 UTC
[29/50] [abbrv] incubator-spot git commit: Added pipeline on ingest
summary link to show pipelines across pages
Added pipeline on ingest summary link to show pipelines across pages
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/5af8419f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/5af8419f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/5af8419f
Branch: refs/heads/SPOT-35_graphql_api
Commit: 5af8419f948c2b5ba4880d0e63c353fdf7e633fa
Parents: 70db6ee
Author: Montes Velazquez <jo...@intel.com>
Authored: Thu Mar 9 18:31:21 2017 -0600
Committer: Diego Ortiz Huerta <di...@intel.com>
Committed: Wed Mar 15 11:49:48 2017 -0700
----------------------------------------------------------------------
spot-oa/ui/dns/storyboard.html | 2 +-
spot-oa/ui/dns/suspicious.html | 2 +-
spot-oa/ui/dns/threat-investigation.html | 2 +-
spot-oa/ui/flow/storyboard.html | 2 +-
spot-oa/ui/flow/suspicious.html | 2 +-
spot-oa/ui/flow/threat-investigation.html | 2 +-
spot-oa/ui/js/actions/SpotActions.js | 6 ++++++
spot-oa/ui/js/constants/SpotConstants.js | 1 +
spot-oa/ui/js/ingest-summary.js | 9 ++++++---
spot-oa/ui/js/stores/IngestSummaryStore.js | 3 +++
spot-oa/ui/proxy/storyboard.html | 2 +-
spot-oa/ui/proxy/suspicious.html | 2 +-
spot-oa/ui/proxy/threat-investigation.html | 2 +-
13 files changed, 25 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/dns/storyboard.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/dns/storyboard.html b/spot-oa/ui/dns/storyboard.html
index c6a2567..251a289 100755
--- a/spot-oa/ui/dns/storyboard.html
+++ b/spot-oa/ui/dns/storyboard.html
@@ -123,7 +123,7 @@
</ul>
</li>
<li>
- <a data-href="../ingest-summary.html#end-date=${date}">Ingest Summary</a>
+ <a data-href="../ingest-summary.html#end-date=${date}|pipeline=dns">Ingest Summary</a>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/dns/suspicious.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/dns/suspicious.html b/spot-oa/ui/dns/suspicious.html
index 31a82c3..54b1edf 100755
--- a/spot-oa/ui/dns/suspicious.html
+++ b/spot-oa/ui/dns/suspicious.html
@@ -133,7 +133,7 @@
</ul>
</li>
<li>
- <a data-href="../ingest-summary.html#end-date=${date}">Ingest Summary</a>
+ <a data-href="../ingest-summary.html#end-date=${date}|pipeline=dns">Ingest Summary</a>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/dns/threat-investigation.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/dns/threat-investigation.html b/spot-oa/ui/dns/threat-investigation.html
index f7f66d0..804a988 100755
--- a/spot-oa/ui/dns/threat-investigation.html
+++ b/spot-oa/ui/dns/threat-investigation.html
@@ -121,7 +121,7 @@
</ul>
</li>
<li>
- <a data-href="../ingest-summary.html#end-date=${date}">Ingest Summary</a>
+ <a data-href="../ingest-summary.html#end-date=${date}|pipeline=dns">Ingest Summary</a>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/flow/storyboard.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/flow/storyboard.html b/spot-oa/ui/flow/storyboard.html
index 0ebf859..48121c2 100755
--- a/spot-oa/ui/flow/storyboard.html
+++ b/spot-oa/ui/flow/storyboard.html
@@ -123,7 +123,7 @@
</ul>
</li>
<li>
- <a data-href="../ingest-summary.html#end-date=${date}">Ingest Summary</a>
+ <a data-href="../ingest-summary.html#end-date=${date}|pipeline=flow">Ingest Summary</a>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/flow/suspicious.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/flow/suspicious.html b/spot-oa/ui/flow/suspicious.html
index f475f4b..b591445 100755
--- a/spot-oa/ui/flow/suspicious.html
+++ b/spot-oa/ui/flow/suspicious.html
@@ -127,7 +127,7 @@
</ul>
</li>
<li>
- <a data-href="../ingest-summary.html#end-date=${date}">Ingest Summary</a>
+ <a data-href="../ingest-summary.html#end-date=${date}|pipeline=flow">Ingest Summary</a>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/flow/threat-investigation.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/flow/threat-investigation.html b/spot-oa/ui/flow/threat-investigation.html
index 97d70f3..0b80392 100755
--- a/spot-oa/ui/flow/threat-investigation.html
+++ b/spot-oa/ui/flow/threat-investigation.html
@@ -121,7 +121,7 @@
</ul>
</li>
<li>
- <a data-href="../ingest-summary.html#end-date=${date}">Ingest Summary</a>
+ <a data-href="../ingest-summary.html#end-date=${date}|pipeline=flow">Ingest Summary</a>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/js/actions/SpotActions.js
----------------------------------------------------------------------
diff --git a/spot-oa/ui/js/actions/SpotActions.js b/spot-oa/ui/js/actions/SpotActions.js
index a70f2a9..c32201f 100755
--- a/spot-oa/ui/js/actions/SpotActions.js
+++ b/spot-oa/ui/js/actions/SpotActions.js
@@ -35,6 +35,12 @@ var SpotActions = {
name: name
});
},
+ setPipeline(pipeline) {
+ SpotDispatcher.dispatch({
+ actionType: SpotConstants.UPDATE_PIPELINE,
+ pipeline
+ });
+ },
expandPanel: function (panel) {
SpotDispatcher.dispatch({
actionType: SpotConstants.EXPAND_PANEL,
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/js/constants/SpotConstants.js
----------------------------------------------------------------------
diff --git a/spot-oa/ui/js/constants/SpotConstants.js b/spot-oa/ui/js/constants/SpotConstants.js
index 204840f..90b03cc 100755
--- a/spot-oa/ui/js/constants/SpotConstants.js
+++ b/spot-oa/ui/js/constants/SpotConstants.js
@@ -4,6 +4,7 @@ const SpotConstants = {
PIPELINE_NETFLOW: 'flow',
PIPELINE_DNS: 'dns',
PIPELINE_PROXY: 'proxy',
+ UPDATE_PIPELINE: 'UPDATE_PIPELINE',
// Search Actions
UPDATE_FILTER: 'UPDATE_FILTER',
UPDATE_DATE: 'UPDATE_DATE',
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/js/ingest-summary.js
----------------------------------------------------------------------
diff --git a/spot-oa/ui/js/ingest-summary.js b/spot-oa/ui/js/ingest-summary.js
index f907477..f374860 100755
--- a/spot-oa/ui/js/ingest-summary.js
+++ b/spot-oa/ui/js/ingest-summary.js
@@ -44,12 +44,12 @@ if (endDate < startDate)
startDate = endDate;
endDate = today;
}
-
const PIPELINES = IngestSummaryStore.PIPELINES;
-const DEFAULT_PIPELINE = Object.keys(PIPELINES)[0];
+//check if pipeline is on URL, if not the first element of PIPELINES is taken
+const DEFAULT_PIPELINE = SpotUtils.getUrlParam('pipeline') || Object.keys(PIPELINES)[0];
const loadPipeline = function loadPipeline(pipeline) {
- IngestSummaryStore.setPipeline(pipeline);
+ SpotActions.setPipeline(pipeline);
InSumActions.reloadSummary();
}
@@ -106,9 +106,12 @@ ReactDOM.render(
document.getElementById('spot-content-wrapper')
);
+
+
// Set period
SpotActions.setDate(startDate, SpotConstants.START_DATE);
SpotActions.setDate(endDate, SpotConstants.END_DATE);
+SpotActions.setPipeline(DEFAULT_PIPELINE);
// Load data
loadPipeline(DEFAULT_PIPELINE);
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/js/stores/IngestSummaryStore.js
----------------------------------------------------------------------
diff --git a/spot-oa/ui/js/stores/IngestSummaryStore.js b/spot-oa/ui/js/stores/IngestSummaryStore.js
index 83e713f..955c451 100755
--- a/spot-oa/ui/js/stores/IngestSummaryStore.js
+++ b/spot-oa/ui/js/stores/IngestSummaryStore.js
@@ -92,6 +92,9 @@ SpotDispatcher.register(function (action) {
case SpotConstants.RELOAD_INGEST_SUMMARY:
iss.sendQuery();
break;
+ case SpotConstants.UPDATE_PIPELINE:
+ iss.setPipeline(action.pipeline)
+ break;
}
});
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/proxy/storyboard.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/proxy/storyboard.html b/spot-oa/ui/proxy/storyboard.html
index cabd387..8d23ebb 100755
--- a/spot-oa/ui/proxy/storyboard.html
+++ b/spot-oa/ui/proxy/storyboard.html
@@ -201,7 +201,7 @@
</ul>
</li>
<li>
- <a data-href="../ingest-summary.html#end-date=${date}">Ingest Summary</a>
+ <a data-href="../ingest-summary.html#end-date=${date}|pipeline=proxy">Ingest Summary</a>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/proxy/suspicious.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/proxy/suspicious.html b/spot-oa/ui/proxy/suspicious.html
index 1d77322..0216982 100755
--- a/spot-oa/ui/proxy/suspicious.html
+++ b/spot-oa/ui/proxy/suspicious.html
@@ -191,7 +191,7 @@
</ul>
</li>
<li>
- <a data-href="../ingest-summary.html#end-date=${date}">Ingest Summary</a>
+ <a data-href="../ingest-summary.html#end-date=${date}|pipeline=proxy">Ingest Summary</a>
</li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5af8419f/spot-oa/ui/proxy/threat-investigation.html
----------------------------------------------------------------------
diff --git a/spot-oa/ui/proxy/threat-investigation.html b/spot-oa/ui/proxy/threat-investigation.html
index 98c3ca4..57b34eb 100755
--- a/spot-oa/ui/proxy/threat-investigation.html
+++ b/spot-oa/ui/proxy/threat-investigation.html
@@ -120,7 +120,7 @@
</ul>
</li>
<li>
- <a data-href="../ingest-summary.html#end-date=${date}">Ingest Summary</a>
+ <a data-href="../ingest-summary.html#end-date=${date}|pipeline=proxy">Ingest Summary</a>
</li>
</ul>
</div>