You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2016/07/04 12:55:17 UTC
ambari git commit: AMBARI-17548 Quicklinks combobox is not present
for Oozie (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 57b795dbc -> cbe8882fc
AMBARI-17548 Quicklinks combobox is not present for Oozie (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cbe8882f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cbe8882f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cbe8882f
Branch: refs/heads/trunk
Commit: cbe8882fc9e548b08d9985f39d75a83455fb9ab4
Parents: 57b795d
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Jul 4 15:55:11 2016 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Jul 4 15:55:11 2016 +0300
----------------------------------------------------------------------
.../OOZIE/4.2.0.2.3/metainfo.xml | 8 ++++
.../OOZIE/4.2.0.2.3/quicklinks/quicklinks.json | 45 ++++++++++++++++++++
.../services/OOZIE/quicklinks/quicklinks.json | 4 +-
.../services/OOZIE/quicklinks/quicklinks.json | 4 +-
4 files changed, 57 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cbe8882f/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml
index c383a82..25584fa 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml
@@ -133,6 +133,14 @@
<config-type>hive-site</config-type>
<config-type>tez-site</config-type>
</configuration-dependencies>
+
+ <quickLinksConfigurations>
+ <quickLinksConfiguration>
+ <fileName>quicklinks.json</fileName>
+ <default>true</default>
+ </quickLinksConfiguration>
+ </quickLinksConfigurations>
+
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/cbe8882f/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/quicklinks/quicklinks.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/quicklinks/quicklinks.json b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/quicklinks/quicklinks.json
new file mode 100644
index 0000000..6353220
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/quicklinks/quicklinks.json
@@ -0,0 +1,45 @@
+{
+ "name": "default",
+ "description": "default quick links configuration",
+ "configuration": {
+ "protocol":
+ {
+ "type":"https",
+ "checks":[
+ {
+ "property":"oozie.https.port",
+ "desired":"EXISTS",
+ "site":"oozie-site"
+ },
+ {
+ "property":"oozie.https.keystore.file",
+ "desired":"EXISTS",
+ "site":"oozie-site"
+ },
+ {
+ "property":"oozie.https.keystore.pass",
+ "desired":"EXISTS",
+ "site":"oozie-site"
+ }
+ ]
+ },
+
+ "links": [
+ {
+ "name": "oozie_server_ui",
+ "label": "Oozie Web UI",
+ "requires_user_name": "true",
+ "component_name": "OOZIE_SERVER",
+ "url":"%@://%@:%@/oozie?user.name=%@",
+ "port":{
+ "http_property": "oozie.base.url",
+ "http_default_port": "11000",
+ "https_property": "oozie.base.url",
+ "https_default_port": "11443",
+ "regex": "\\w*:(\\d+)",
+ "site": "oozie-site"
+ }
+ }
+ ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/cbe8882f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/quicklinks/quicklinks.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/quicklinks/quicklinks.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/quicklinks/quicklinks.json
index 5d68c46..f83bb5c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/quicklinks/quicklinks.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/quicklinks/quicklinks.json
@@ -26,7 +26,7 @@
"links": [
{
- "name": "resourcemanager_ui",
+ "name": "oozie_server_ui",
"label": "Oozie Web UI",
"requires_user_name": "true",
"component_name": "OOZIE_SERVER",
@@ -42,4 +42,4 @@
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/cbe8882f/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/quicklinks/quicklinks.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/quicklinks/quicklinks.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/quicklinks/quicklinks.json
index c240734..81e7cbe 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/quicklinks/quicklinks.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/quicklinks/quicklinks.json
@@ -26,7 +26,7 @@
"links": [
{
- "name": "resourcemanager_ui",
+ "name": "oozie_server_ui",
"component_name": "OOZIE_SERVER",
"label": "Oozie Web UI",
"requires_user_name": "true",
@@ -42,4 +42,4 @@
}
]
}
-}
\ No newline at end of file
+}