You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by pz...@apache.org on 2019/07/22 19:47:32 UTC
[knox] branch master updated (ae44c17 -> b10a852)
This is an automated email from the ASF dual-hosted git repository.
pzampino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git.
from ae44c17 KNOX-1593 - YARN v2 UI - Application - View logs for running application
new 34723fd KNOX-1928 - CM discovery - Multiple of same url are added to descriptor
new b10a852 KNOX-1927 - CM discovery - ZEPPELINUI / ZEPPELINWS urls are not discovered
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../model/atlas/AtlasUIServiceModelGenerator.java | 39 ----------------------
.../ranger/RangerUIAPIServiceModelGenerator.java | 38 ---------------------
.../cm/model/solr/SolrUIServiceModelGenerator.java | 38 ---------------------
.../ZeppelinServiceModelGenerator.java} | 15 ++++-----
.../zeppelin/ZeppelinUIServiceModelGenerator.java | 34 ++++---------------
.../zeppelin/ZeppelinWSServiceModelGenerator.java | 24 +++++++------
...way.topology.discovery.cm.ServiceModelGenerator | 6 ++--
7 files changed, 29 insertions(+), 165 deletions(-)
delete mode 100644 gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/atlas/AtlasUIServiceModelGenerator.java
delete mode 100644 gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/ranger/RangerUIAPIServiceModelGenerator.java
delete mode 100644 gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/solr/SolrUIServiceModelGenerator.java
copy gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/{atlas/AtlasServiceModelGenerator.java => zeppelin/ZeppelinServiceModelGenerator.java} (82%)
[knox] 01/02: KNOX-1928 - CM discovery - Multiple of same url are
added to descriptor
Posted by pz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pzampino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
commit 34723fd546e1c996904614fb35eb37ca740dd789
Author: pzampino <pz...@cloudera.com>
AuthorDate: Sat Jul 20 22:10:31 2019 -0400
KNOX-1928 - CM discovery - Multiple of same url are added to descriptor
---
.../model/atlas/AtlasUIServiceModelGenerator.java | 39 ----------------------
.../ranger/RangerUIAPIServiceModelGenerator.java | 38 ---------------------
.../cm/model/solr/SolrUIServiceModelGenerator.java | 38 ---------------------
...way.topology.discovery.cm.ServiceModelGenerator | 3 --
4 files changed, 118 deletions(-)
diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/atlas/AtlasUIServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/atlas/AtlasUIServiceModelGenerator.java
deleted file mode 100644
index 43f389a..0000000
--- a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/atlas/AtlasUIServiceModelGenerator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.knox.gateway.topology.discovery.cm.model.atlas;
-
-import com.cloudera.api.swagger.client.ApiException;
-import com.cloudera.api.swagger.model.ApiConfigList;
-import com.cloudera.api.swagger.model.ApiRole;
-import com.cloudera.api.swagger.model.ApiService;
-import com.cloudera.api.swagger.model.ApiServiceConfig;
-import org.apache.knox.gateway.topology.discovery.cm.ServiceModel;
-
-public class AtlasUIServiceModelGenerator extends AtlasAPIServiceModelGenerator {
- private static final String SERVICE = "ATLAS-API"; // TODO: PJZ: Should this really be -API?
-
- @Override
- public ServiceModel generateService(ApiService service,
- ApiServiceConfig serviceConfig,
- ApiRole role,
- ApiConfigList roleConfig) throws ApiException {
- return new ServiceModel(ServiceModel.Type.UI,
- SERVICE,
- super.generateService(service, serviceConfig, role, roleConfig).getServiceUrl());
- }
-
-}
diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/ranger/RangerUIAPIServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/ranger/RangerUIAPIServiceModelGenerator.java
deleted file mode 100644
index b635547..0000000
--- a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/ranger/RangerUIAPIServiceModelGenerator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.knox.gateway.topology.discovery.cm.model.ranger;
-
-import com.cloudera.api.swagger.model.ApiConfigList;
-import com.cloudera.api.swagger.model.ApiRole;
-import com.cloudera.api.swagger.model.ApiService;
-import com.cloudera.api.swagger.model.ApiServiceConfig;
-import org.apache.knox.gateway.topology.discovery.cm.ServiceModel;
-
-public class RangerUIAPIServiceModelGenerator extends RangerServiceModelGenerator {
- private static final String SERVICE = "RANGER";
-
- @Override
- public ServiceModel generateService(ApiService service,
- ApiServiceConfig serviceConfig,
- ApiRole role,
- ApiConfigList roleConfig) {
- return new ServiceModel(ServiceModel.Type.UI,
- SERVICE,
- super.generateService(service, serviceConfig, role, roleConfig).getServiceUrl());
- }
-
-}
diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/solr/SolrUIServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/solr/SolrUIServiceModelGenerator.java
deleted file mode 100644
index 301ba0f..0000000
--- a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/solr/SolrUIServiceModelGenerator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.knox.gateway.topology.discovery.cm.model.solr;
-
-import com.cloudera.api.swagger.model.ApiConfigList;
-import com.cloudera.api.swagger.model.ApiRole;
-import com.cloudera.api.swagger.model.ApiService;
-import com.cloudera.api.swagger.model.ApiServiceConfig;
-import org.apache.knox.gateway.topology.discovery.cm.ServiceModel;
-
-public class SolrUIServiceModelGenerator extends SolrServiceModelGenerator {
- private static final String SERVICE = "SOLR";
-
- @Override
- public ServiceModel generateService(ApiService service,
- ApiServiceConfig serviceConfig,
- ApiRole role,
- ApiConfigList roleConfig) {
- String serviceUrl = super.generateService(service, serviceConfig, role, roleConfig).getServiceUrl();
- return new ServiceModel(ServiceModel.Type.UI, SERVICE, serviceUrl);
- }
-
-
-}
diff --git a/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator b/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
index b4f485c..699f4b2 100644
--- a/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
+++ b/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
@@ -18,7 +18,6 @@
org.apache.knox.gateway.topology.discovery.cm.model.atlas.AtlasServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.atlas.AtlasAPIServiceModelGenerator
-org.apache.knox.gateway.topology.discovery.cm.model.atlas.AtlasUIServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.hbase.HBaseUIServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.hbase.WebHBaseServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.hdfs.NameNodeServiceModelGenerator
@@ -33,9 +32,7 @@ org.apache.knox.gateway.topology.discovery.cm.model.oozie.OozieServiceModelGener
org.apache.knox.gateway.topology.discovery.cm.model.oozie.OozieUIServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.ranger.RangerServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.ranger.RangerUIServiceModelGenerator
-org.apache.knox.gateway.topology.discovery.cm.model.ranger.RangerUIAPIServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.solr.SolrServiceModelGenerator
-org.apache.knox.gateway.topology.discovery.cm.model.solr.SolrUIServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.spark.SparkHistoryUIServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.yarn.JobHistoryUIServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.yarn.ResourceManagerUIServiceModelGenerator
[knox] 02/02: KNOX-1927 - CM discovery - ZEPPELINUI / ZEPPELINWS
urls are not discovered
Posted by pz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pzampino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
commit b10a852e9035048f67306f288d7efce935961775
Author: pzampino <pz...@cloudera.com>
AuthorDate: Mon Jul 22 15:01:56 2019 -0400
KNOX-1927 - CM discovery - ZEPPELINUI / ZEPPELINWS urls are not discovered
---
...tor.java => ZeppelinServiceModelGenerator.java} | 30 ++++++++++---------
.../zeppelin/ZeppelinUIServiceModelGenerator.java | 34 ++++------------------
.../zeppelin/ZeppelinWSServiceModelGenerator.java | 24 ++++++++-------
...way.topology.discovery.cm.ServiceModelGenerator | 3 ++
4 files changed, 38 insertions(+), 53 deletions(-)
diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinUIServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinServiceModelGenerator.java
similarity index 74%
copy from gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinUIServiceModelGenerator.java
copy to gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinServiceModelGenerator.java
index 72b4e8c..b6a4f9e 100644
--- a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinUIServiceModelGenerator.java
+++ b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinServiceModelGenerator.java
@@ -16,6 +16,7 @@
*/
package org.apache.knox.gateway.topology.discovery.cm.model.zeppelin;
+import com.cloudera.api.swagger.client.ApiException;
import com.cloudera.api.swagger.model.ApiConfigList;
import com.cloudera.api.swagger.model.ApiRole;
import com.cloudera.api.swagger.model.ApiService;
@@ -25,10 +26,10 @@ import org.apache.knox.gateway.topology.discovery.cm.model.AbstractServiceModelG
import java.util.Locale;
-public class ZeppelinUIServiceModelGenerator extends AbstractServiceModelGenerator {
- private static final String SERVICE = "ZEPPELINUI";
- private static final String SERVICE_TYPE = "ZEPPELIN";
- private static final String ROLE_TYPE = "ZEPPELIN_SERVER";
+public class ZeppelinServiceModelGenerator extends AbstractServiceModelGenerator {
+ private static final String SERVICE = "ZEPPELIN";
+ protected static final String SERVICE_TYPE = "ZEPPELIN";
+ protected static final String ROLE_TYPE = "ZEPPELIN_SERVER";
@Override
public boolean handles(ApiService service, ApiServiceConfig serviceConfig, ApiRole role, ApiConfigList roleConfig) {
@@ -39,19 +40,20 @@ public class ZeppelinUIServiceModelGenerator extends AbstractServiceModelGenerat
public ServiceModel generateService(ApiService service,
ApiServiceConfig serviceConfig,
ApiRole role,
- ApiConfigList roleConfig) {
+ ApiConfigList roleConfig) throws ApiException {
String hostname = role.getHostRef().getHostname();
- String scheme = "http";
- String port = getRoleConfigValue(roleConfig, "zeppelin_server_port");
-// boolean sslEnabled = Boolean.parseBoolean(getRoleConfigValue(roleConfig, "ssl_enabled"));
-// if(sslEnabled) {
-// scheme = "https";
-// } else {
-// scheme = "http";
-// }
+ String scheme;
+ String port;
+ boolean sslEnabled = Boolean.parseBoolean(getRoleConfigValue(roleConfig, "ssl_enabled"));
+ if(sslEnabled) {
+ scheme = "https";
+ port = getRoleConfigValue(roleConfig, "zeppelin_server_ssl_port");
+ } else {
+ scheme = "http";
+ port = getRoleConfigValue(roleConfig, "zeppelin_server_port");
+ }
return new ServiceModel(ServiceModel.Type.UI,
SERVICE,
String.format(Locale.getDefault(), "%s://%s:%s", scheme, hostname, port));
}
-
}
diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinUIServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinUIServiceModelGenerator.java
index 72b4e8c..1f2b2d8 100644
--- a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinUIServiceModelGenerator.java
+++ b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinUIServiceModelGenerator.java
@@ -16,42 +16,20 @@
*/
package org.apache.knox.gateway.topology.discovery.cm.model.zeppelin;
+
+import com.cloudera.api.swagger.client.ApiException;
import com.cloudera.api.swagger.model.ApiConfigList;
import com.cloudera.api.swagger.model.ApiRole;
import com.cloudera.api.swagger.model.ApiService;
import com.cloudera.api.swagger.model.ApiServiceConfig;
import org.apache.knox.gateway.topology.discovery.cm.ServiceModel;
-import org.apache.knox.gateway.topology.discovery.cm.model.AbstractServiceModelGenerator;
-
-import java.util.Locale;
-public class ZeppelinUIServiceModelGenerator extends AbstractServiceModelGenerator {
+public class ZeppelinUIServiceModelGenerator extends ZeppelinServiceModelGenerator {
private static final String SERVICE = "ZEPPELINUI";
- private static final String SERVICE_TYPE = "ZEPPELIN";
- private static final String ROLE_TYPE = "ZEPPELIN_SERVER";
-
- @Override
- public boolean handles(ApiService service, ApiServiceConfig serviceConfig, ApiRole role, ApiConfigList roleConfig) {
- return SERVICE_TYPE.equals(service.getType()) && ROLE_TYPE.equals(role.getType());
- }
@Override
- public ServiceModel generateService(ApiService service,
- ApiServiceConfig serviceConfig,
- ApiRole role,
- ApiConfigList roleConfig) {
- String hostname = role.getHostRef().getHostname();
- String scheme = "http";
- String port = getRoleConfigValue(roleConfig, "zeppelin_server_port");
-// boolean sslEnabled = Boolean.parseBoolean(getRoleConfigValue(roleConfig, "ssl_enabled"));
-// if(sslEnabled) {
-// scheme = "https";
-// } else {
-// scheme = "http";
-// }
- return new ServiceModel(ServiceModel.Type.UI,
- SERVICE,
- String.format(Locale.getDefault(), "%s://%s:%s", scheme, hostname, port));
+ public ServiceModel generateService(ApiService service, ApiServiceConfig serviceConfig, ApiRole role, ApiConfigList roleConfig) throws ApiException {
+ ServiceModel sm = super.generateService(service, serviceConfig, role, roleConfig);
+ return new ServiceModel(sm.getType(), SERVICE, sm.getServiceUrl());
}
-
}
diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinWSServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinWSServiceModelGenerator.java
index bdf91b5..9f89412 100644
--- a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinWSServiceModelGenerator.java
+++ b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/zeppelin/ZeppelinWSServiceModelGenerator.java
@@ -24,7 +24,7 @@ import org.apache.knox.gateway.topology.discovery.cm.ServiceModel;
import java.util.Locale;
-public class ZeppelinWSServiceModelGenerator extends ZeppelinUIServiceModelGenerator {
+public class ZeppelinWSServiceModelGenerator extends ZeppelinServiceModelGenerator {
private static final String SERVICE = "ZEPPELINWS";
@Override
@@ -33,17 +33,19 @@ public class ZeppelinWSServiceModelGenerator extends ZeppelinUIServiceModelGener
ApiRole role,
ApiConfigList roleConfig) {
String hostname = role.getHostRef().getHostname();
- String scheme = "ws";
- String port = getRoleConfigValue(roleConfig, "zeppelin_server_port");
-// boolean sslEnabled = Boolean.parseBoolean(getRoleConfigValue(roleConfig, "ssl_enabled"));
-// if(sslEnabled) {
-// scheme = "wss";
-// } else {
-// scheme = "ws";
-// }
- return new ServiceModel(ServiceModel.Type.UI,
+ String scheme;
+ String port;
+ boolean sslEnabled = Boolean.parseBoolean(getRoleConfigValue(roleConfig, "ssl_enabled"));
+ if(sslEnabled) {
+ scheme = "wss";
+ port = getRoleConfigValue(roleConfig, "zeppelin_server_ssl_port");
+ } else {
+ scheme = "ws";
+ port = getRoleConfigValue(roleConfig, "zeppelin_server_port");
+ }
+ return new ServiceModel(ServiceModel.Type.API,
SERVICE,
- String.format(Locale.getDefault(), "%s://%s:%s", scheme, hostname, port));
+ String.format(Locale.getDefault(), "%s://%s:%s/ws", scheme, hostname, port));
}
}
diff --git a/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator b/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
index 699f4b2..4835681 100644
--- a/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
+++ b/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
@@ -38,4 +38,7 @@ org.apache.knox.gateway.topology.discovery.cm.model.yarn.JobHistoryUIServiceMode
org.apache.knox.gateway.topology.discovery.cm.model.yarn.ResourceManagerUIServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.yarn.YarnUIServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.yarn.YarnUIv2ServiceModelGenerator
+org.apache.knox.gateway.topology.discovery.cm.model.zeppelin.ZeppelinServiceModelGenerator
+org.apache.knox.gateway.topology.discovery.cm.model.zeppelin.ZeppelinUIServiceModelGenerator
+org.apache.knox.gateway.topology.discovery.cm.model.zeppelin.ZeppelinWSServiceModelGenerator