This is an automated email from the ASF dual-hosted git repository.
jihao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new bf928e9 [TE] Fix issue of not loading RCA template when metricid is
not specified (#5799)
bf928e9 is described below
commit bf928e96dcb215a41ccf56b431982579d71b65eb
Author: Vincent Chen <jianc...@linkedin.com>
AuthorDate: Wed Aug 5 10:29:26 2020 -0700
[TE] Fix issue of not loading RCA template when metricid is not specified
(#5799)
This PR is to fix the issue that RCA template is not loaded when there is
only anomalyId is specified in the RCA URL. The fix is to pull metric templates
after metric IDs are fetched based on the anomalies in the URLs.
---
.../thirdeye-frontend/app/pods/rootcause/route.js | 70 ++++++++++++++--------
1 file changed, 46 insertions(+), 24 deletions(-)
diff --git a/thirdeye/thirdeye-frontend/app/pods/rootcause/route.js
b/thirdeye/thirdeye-frontend/app/pods/rootcause/route.js
index 98b5464..fd28744 100644
--- a/thirdeye/thirdeye-frontend/app/pods/rootcause/route.js
+++ b/thirdeye/thirdeye-frontend/app/pods/rootcause/route.js
@@ -167,17 +167,33 @@ export default Route.extend(AuthenticatedRouteMixin, {
let { contextUrnsInit, selectedUrnsInit, anomalyUrnsInit,
anomalyRangeInit, analysisRangeInit, compareModeInit, granularityInit } =
params;
const isDevEnv = config.environment === 'development';
- let metricUrn, metricEntity, session, anomalyUrn, anomalyEntity,
anomalySessions, metricTemplate;
+ let metricUrn, metricEntity, session, anomalyUrn, anomalyTemplateEntity,
anomalySessions, metricTemplate;
if (metricId) {
metricUrn = `thirdeye:metric:${metricId}`;
metricEntity =
fetch(`/rootcause/raw?framework=identity&urns=${metricUrn}`).then(checkStatus).then(res
=> res[0]).catch(() => {});
- metricTemplate =
fetch(`/rootcause/template/search?metricId=${metricId}`).then(checkStatus).then(res
=> (res.length != 0) ? res[0] : null).catch(() => {});
+ metricTemplate =
fetch(`/rootcause/template/search?metricId=${metricId}`).then(checkStatus).then(res
=> (res) ? res[0] : null).catch(() => {});
}
if (anomalyId) {
anomalyUrn = `thirdeye:event:anomaly:${anomalyId}`;
- anomalyEntity =
fetch(`/rootcause/raw?framework=identity&urns=${anomalyUrn}`).then(checkStatus).then(res
=> res[0]).catch(() => {});
+ anomalyTemplateEntity =
fetch(`/rootcause/raw?framework=identity&urns=${anomalyUrn}`)
+ .then(checkStatus)
+ .then(res => {
+ const anomalyMetricId = res[0].attributes.metricId[0];
+ const entityFromResponse = res[0];
+ // retrieve metric template for the corresponding metric
+ return
fetch(`/rootcause/template/search?metricId=${anomalyMetricId}`)
+ .then(checkStatus)
+ .then(res1 => (res1) ? res1[0] : null)
+ .then(res => {
+ metricTemplate = res;
+ return {
+ template: res,
+ entity: entityFromResponse
+ };
+ }).catch(() => {});
+ }).catch(() => {});
anomalySessions =
fetch(`/session/query?anomalyId=${anomalyId}`).then(checkStatus).catch(() =>
{});
}
@@ -219,7 +235,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
session,
anomalyId,
anomalyUrn,
- anomalyEntity,
+ anomalyTemplateEntity,
anomalySessions,
contextUrnsPredefined,
selectedUrnsPredefined,
@@ -263,11 +279,11 @@ export default Route.extend(AuthenticatedRouteMixin, {
// default params
assignDefaults(model, defaultParams);
+ const {anomalySessions} = model;
// load latest saved session for anomaly
- const { anomalySessions } = model;
if (!_.isEmpty(anomalySessions)) {
- const mostRecent = _.last(_.sortBy(anomalySessions, 'updated'));
+ const mostRecent = _.last(_.sortBy(anomalySessions, 'updated'));
model.anomalyId = null;
model.anomalyUrn = null;
model.anomalyContext = null;
@@ -296,13 +312,19 @@ export default Route.extend(AuthenticatedRouteMixin, {
session,
anomalyId,
anomalyUrn,
- anomalyEntity,
+ anomalyTemplateEntity,
contextUrnsPredefined,
selectedUrnsPredefined,
- anomalyUrnsPredefined,
- metricTemplate
+ anomalyUrnsPredefined
} = model;
+ /*
+ To ensure that the call to search for metric template happens after
getting metric id of an anomaly,
+ we put anomalyEntity and metricTemplate under anomalyTemplateEntity
+ */
+ const metricTemplate = (model.metricTemplate) ? model.metricTemplate :
(anomalyTemplateEntity || {}).template;
+ const anomalyEntity = (anomalyTemplateEntity || {}).entity;
+
// default blank context
let context = {
urns: new Set(),
@@ -325,6 +347,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
let sessionUserCustomized = false;
let setupMode = ROOTCAUSE_SETUP_MODE_CONTEXT;
let routeErrors = new Set();
+ let baseMetricUrn = null;
// metric-initialized context
if (metricId && metricUrn) {
@@ -357,19 +380,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
}
}
- // rca template context
- if(metricTemplate) {
- const dimAnalysisModule = metricTemplate.modules[0];
- sessionTableSettings = {
- oneSideError: dimAnalysisModule.configuration.oneSideError,
- orderType: (dimAnalysisModule.configuration.manualOrder == true) ?
'manual' : 'auto',
- summarySize: dimAnalysisModule.configuration.summarySize,
- depth: dimAnalysisModule.configuration.dimensionDepth,
- dimensions: dimAnalysisModule.configuration.includedDimension,
- excludedDimensions:
(dimAnalysisModule.configuration.excludedDimension) ?
dimAnalysisModule.configuration.excludedDimension : []
- };
- sessionUserCustomized = true;
- }
+
// anomaly-initialized context
if (anomalyId && anomalyUrn) {
@@ -403,7 +414,6 @@ export default Route.extend(AuthenticatedRouteMixin, {
compareMode: 'WoW',
anomalyUrns: new Set([anomalyUrn,
anomalyMetricUrn].concat(anomalyFunctionUrns))
};
-
selectedUrns = new Set([anomalyUrn, anomalyMetricUrn]);
const metricName = anomalyEntity.attributes.metric[0];
sessionName = this._makeTitleHeader(metricName, anomalyRange,
anomalyEntity);
@@ -413,7 +423,19 @@ export default Route.extend(AuthenticatedRouteMixin, {
routeErrors.add(`Could not find anomalyId ${anomalyId}`);
}
}
-
+ // rca template context
+ if(metricTemplate) {
+ const dimAnalysisModule = metricTemplate.modules[0];
+ sessionTableSettings = {
+ oneSideError: dimAnalysisModule.configuration.oneSideError,
+ orderType: (dimAnalysisModule.configuration.manualOrder == true) ?
'manual' : 'auto',
+ summarySize: dimAnalysisModule.configuration.summarySize,
+ depth: dimAnalysisModule.configuration.dimensionDepth,
+ dimensions: dimAnalysisModule.configuration.includedDimension,
+ excludedDimensions:
(dimAnalysisModule.configuration.excludedDimension) ?
dimAnalysisModule.configuration.excludedDimension : []
+ };
+ sessionUserCustomized = true;
+ }
// session-initialized context
if (sessionId) {
if (!_.isEmpty(session)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
