You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by di...@apache.org on 2016/03/09 16:50:49 UTC
ambari git commit: AMBARI-15285:AMS quicklink directory name is wrong
causing errors in ambari server start (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk dddffd5c6 -> 354d07933
AMBARI-15285:AMS quicklink directory name is wrong causing errors in ambari server start (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/354d0793
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/354d0793
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/354d0793
Branch: refs/heads/trunk
Commit: 354d07933f7a5ad27ff2e7a93d802fd8d10798e8
Parents: dddffd5
Author: Di Li <di...@apache.org>
Authored: Wed Mar 9 10:50:15 2016 -0500
Committer: Di Li <di...@apache.org>
Committed: Wed Mar 9 10:50:15 2016 -0500
----------------------------------------------------------------------
.../0.1.0/quickLinks/quicklinks.json | 34 --------------------
.../0.1.0/quicklinks/quicklinks.json | 34 ++++++++++++++++++++
2 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/354d0793/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quickLinks/quicklinks.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quickLinks/quicklinks.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quickLinks/quicklinks.json
deleted file mode 100644
index 1c276c0..0000000
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quickLinks/quicklinks.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "name": "default",
- "description": "default quick links configuration",
- "configuration": {
- "protocol":
- {
- "type":"https",
- "checks":[
- {
- "property":"protocol",
- "desired":"https",
- "site":"ams-grafana-ini"
- }
- ]
- },
- "links": [
- {
- "name": "metrics_ui_server",
- "label": "Grafana",
- "requires_user_name": "false",
- "url":"%@://%@:%@",
- "template":"%@://%@:%@",
- "port":{
- "http_property": "port",
- "http_default_port": "3000",
- "https_property": "port",
- "https_default_port": "3000",
- "regex": "^(\\d+)$",
- "site": "ams-grafana-ini"
- }
- }
- ]
- }
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/354d0793/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quicklinks/quicklinks.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quicklinks/quicklinks.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quicklinks/quicklinks.json
new file mode 100644
index 0000000..1c276c0
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/quicklinks/quicklinks.json
@@ -0,0 +1,34 @@
+{
+ "name": "default",
+ "description": "default quick links configuration",
+ "configuration": {
+ "protocol":
+ {
+ "type":"https",
+ "checks":[
+ {
+ "property":"protocol",
+ "desired":"https",
+ "site":"ams-grafana-ini"
+ }
+ ]
+ },
+ "links": [
+ {
+ "name": "metrics_ui_server",
+ "label": "Grafana",
+ "requires_user_name": "false",
+ "url":"%@://%@:%@",
+ "template":"%@://%@:%@",
+ "port":{
+ "http_property": "port",
+ "http_default_port": "3000",
+ "https_property": "port",
+ "https_default_port": "3000",
+ "regex": "^(\\d+)$",
+ "site": "ams-grafana-ini"
+ }
+ }
+ ]
+ }
+}