This is an automated email from the ASF dual-hosted git repository.
xhsun 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 d120f4d [TE] frontend - harleyjj/create-alert - add link for
onboarding mysql and presto metrics (#4483)
d120f4d is described below
commit d120f4d2624695ae7822f2b00c63b00f7b68951a
Author: Harley Jackson <[email protected]>
AuthorDate: Mon Aug 19 08:51:08 2019 -0700
[TE] frontend - harleyjj/create-alert - add link for onboarding mysql and
presto metrics (#4483)
---
.../app/pods/components/detection-yaml/template.hbs | 5 +++--
.../app/pods/self-serve/import-sql-metric/controller.js | 4 ++--
.../tests/acceptance/self-serve-import-metric-test.js | 3 +--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/thirdeye/thirdeye-frontend/app/pods/components/detection-yaml/template.hbs
b/thirdeye/thirdeye-frontend/app/pods/components/detection-yaml/template.hbs
index 108bb5c..0cdee45 100644
--- a/thirdeye/thirdeye-frontend/app/pods/components/detection-yaml/template.hbs
+++ b/thirdeye/thirdeye-frontend/app/pods/components/detection-yaml/template.hbs
@@ -3,9 +3,10 @@
</div>
<div class="col-xs-12 {{if isEditMode "bottom-margin"}}">
{{#unless isEditMode}}
- <label for="select-metric" class="control-label te-label te-label--taller
required">Can't find your metric?
+ <label for="select-metric" class="control-label te-label te-label--taller
required">Can't find your metric? Import a Metric From
{{#link-to "self-serve.import-metric" class="thirdeye-link-secondary
thirdeye-link-secondary--inside"}}
- Import a Metric From InGraphs
+ InGraphs{{/link-to}} or {{#link-to "self-serve.import-sql-metric"
class="thirdeye-link-secondary thirdeye-link-secondary--inside"}}
+ MySQL/Presto
{{/link-to}}
</label>
{{/unless}}
diff --git
a/thirdeye/thirdeye-frontend/app/pods/self-serve/import-sql-metric/controller.js
b/thirdeye/thirdeye-frontend/app/pods/self-serve/import-sql-metric/controller.js
index f2798f5..d4135cf 100644
---
a/thirdeye/thirdeye-frontend/app/pods/self-serve/import-sql-metric/controller.js
+++
b/thirdeye/thirdeye-frontend/app/pods/self-serve/import-sql-metric/controller.js
@@ -23,7 +23,7 @@ export default Controller.extend({
this.timeFormatOptions = ['EPOCH', 'yyyyMMdd', 'yyyy-MM-dd',
'yyyy-MM-dd-HH', 'yyyy-MM-dd HH:mm:ss', 'yyyy-MM-dd HH:mm:ss.S',
'yyyyMMddHHmmss'];
this.timeGranularityOptions = ['1MILLISECONDS', '1SECONDS', '1MINUTES',
'1HOURS', '1DAYS', '1WEEKs', '1MONTHS', '1YEARS'];
this.timezoneOptions = ["UTC", "Pacific/Midway", "US/Hawaii", "US/Alaska",
"US/Pacific", "US/Arizona", "US/Mountain", "US/Central",
- "US/Eastern", "America/Caracas", "America/Manaus", "America/Santiago",
"Canada/Newfoundland", "Brazil/East", "America/Buenos_Aires",
+ "US/Eastern", "America/Caracas", "America/Manaus", "America/Santiago",
"Canada/Newfoundland", "Brazil/East", "America/Buenos_Aires",
"America/Godthab", "America/Montevideo", "Atlantic/South_Georgia",
"Atlantic/Azores", "Atlantic/Cape_Verde", "Africa/Casablanca",
"Europe/London", "Europe/Berlin", "Europe/Belgrade", "Europe/Brussels",
"Europe/Warsaw", "Africa/Algiers", "Asia/Amman", "Europe/Athens",
"Asia/Beirut", "Africa/Cairo", "Africa/Harare", "Europe/Helsinki",
"Asia/Jerusalem", "Europe/Minsk", "Africa/Windhoek",
@@ -47,7 +47,7 @@ export default Controller.extend({
}
}
});
- });
+ }).catch(err => {});
},
/**
diff --git
a/thirdeye/thirdeye-frontend/tests/acceptance/self-serve-import-metric-test.js
b/thirdeye/thirdeye-frontend/tests/acceptance/self-serve-import-metric-test.js
index 331c475..d073a4b 100644
---
a/thirdeye/thirdeye-frontend/tests/acceptance/self-serve-import-metric-test.js
+++
b/thirdeye/thirdeye-frontend/tests/acceptance/self-serve-import-metric-test.js
@@ -7,7 +7,7 @@ import { visit, fillIn, click, currentURL, triggerKeyEvent }
from '@ember/test-h
module('Acceptance | import metric', function(hooks) {
setupApplicationTest(hooks);
- const importLinkText = 'Import a Metric From InGraphs';
+ const importLinkText = 'InGraphs';
const returnLinkText = 'Back to Create';
const inGraphsLinkText = 'Go to InGraphs';
const dashboardToImport = 'thirdeye-all';
@@ -17,7 +17,6 @@ module('Acceptance | import metric', function(hooks) {
test(`visiting alert creation page to navigate to import page`, async
(assert) => {
await visit(`/self-serve/create-alert`);
-
assert.equal(
$(selfServeConst.SECONDARY_LINK).get(1).innerText.trim(),
importLinkText,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
