Skip to content

Commit

Permalink
Fix view server and open lineage server name
Browse files Browse the repository at this point in the history 
Signed-off-by: Mandy Chessell <[email protected]>
  • Loading branch information
@mandy-chessell
mandy-chessell committed Feb 1, 2024
1 parent 69e6d3d commit b8e3357
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 40 deletions.
14 changes: 7 additions & 7 deletions bom/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ext {
commonsconfigurationVersion = '1.10'
commonsioVersion = '2.13.0'
commonsloggingVersion = '1.3.0'
commonstextVersion = '1.10.0'
commonstextVersion = '1.11.0'
commonscliVersion = '1.6.0'
elasticsearchVersion = '8.7.1'
findbugsVersion = '3.0.2'
Expand All @@ -60,7 +60,7 @@ ext {
javassistVersion = '3.29.2-GA'
jaxbVersion = '2.3.1'
jenaVersion = '4.7.0'
jodatimeVersion = '2.12.5'
jodatimeVersion = '2.12.6'
jsonldVersion = '0.13.6'
junitVersion = '4.13.2'
junitjupiterVersion = '5.10.0'
Expand All @@ -69,10 +69,10 @@ ext {
jwtApiVersion = '0.11.5'
jwtImplVersion = '0.11.5'
jwtJacksonVersion = '0.11.5'
kafkaVersion = '3.6.0'
kafkaVersion = '3.6.1'
lang3Version = '3.14.0'
logbackVersion = '1.4.5'
lettuceVersion = '6.2.6.RELEASE'
lettuceVersion = '6.3.1.RELEASE'
// TODO: Version 9 now available
luceneVersion = '8.11.2'
openlineageVersion = '1.8.0'
Expand Down Expand Up @@ -101,16 +101,16 @@ ext {
testngVersion = '7.8.0'
thriftVersion = '0.19.0'
springwebVersion = '6.0.6'
tinkVersion = '1.11.0'
tinkVersion = '1.12.0'
tomcatVersion = '10.1.13'
validationVersion = '2.0.1.Final'
gsonVersion = '2.10.1'
antVersion = '1.10.14'
jnrVersion = '3.1.18'
cassandraVersion = '4.1.3'
protobufVersion = '3.25.1'
protobufVersion = '3.25.2'
osgiVersion = '8.0.0'
log4jVersion = '2.22.0'
log4jVersion = '2.22.1'
jacksonjdk8Version = '2.16.1'
reactivestreamsVersion = '1.0.4'
springdocStarterVersion = '2.2.0'
Expand Down
5 changes: 3 additions & 2 deletions .../odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,14 @@ private String setUpExternalLogFile(String surveyReportGUID,

File logFile = new File(logFileName);

if (logFile.exists())
try
{
FileUtils.sizeOf(logFile);
auditLog.logMessage(methodName,
SurveyServiceAuditCode.REUSING_LOG_FILE.getMessageDefinition(surveyActionServiceName,
logFileName));
}
else
catch (IllegalArgumentException notFound)
{
auditLog.logMessage(methodName,
SurveyServiceAuditCode.CREATING_LOG_FILE.getMessageDefinition(surveyActionServiceName,
Expand Down
14 changes: 7 additions & 7 deletions .../openmetadata/adminservices/configuration/registration/GovernanceServicesDescription.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ public enum GovernanceServicesDescription implements Serializable
/**
* Store and query asset lineage.
*/
OPEN_LINEAGE_SERVICES (190,
ComponentDevelopmentStatus.STABLE,
"Open Lineage Services",
"open-lineage",
"Store and query asset lineage",
"https://egeria-project.org/services/open-lineage-services/"),
LINEAGE_WAREHOUSE_SERVICES(190,
ComponentDevelopmentStatus.STABLE,
"Lineage Warehouse Services",
"open-lineage",
"Store and query asset lineage",
"https://egeria-project.org/services/lineage-warehouse-services/"),

/**
* Run automated open metadata conformance suite services.
Expand Down Expand Up @@ -86,7 +86,7 @@ public static List<GovernanceServicesDescription> getGovernanceServersDescriptio
{
List<GovernanceServicesDescription> serviceDescriptionList = new ArrayList<>();

serviceDescriptionList.add(GovernanceServicesDescription.OPEN_LINEAGE_SERVICES);
serviceDescriptionList.add(GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES);
serviceDescriptionList.add(GovernanceServicesDescription.INTEGRATION_DAEMON_SERVICES);
serviceDescriptionList.add(GovernanceServicesDescription.CONFORMANCE_SUITE_SERVICES);
serviceDescriptionList.add(GovernanceServicesDescription.DATA_ENGINE_PROXY_SERVICES);
Expand Down
12 changes: 6 additions & 6 deletions ...er/src/main/java/org/odpi/openmetadata/adminservices/classifier/ServerTypeClassifier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ else if (localRepositoryMode == LocalRepositoryMode.REPOSITORY_PROXY)

this.validateSubsystemNotConfigured(serverName,
serverTypeClassification.getServerTypeName(),
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(),
openLineageServerConfig);

this.validateSubsystemNotConfigured(serverName,
Expand Down Expand Up @@ -183,7 +183,7 @@ else if (localRepositoryMode == LocalRepositoryMode.REPOSITORY_PROXY)

this.validateSubsystemNotConfigured(serverName,
serverTypeClassification.getServerTypeName(),
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(),
openLineageServerConfig);
}

Expand Down Expand Up @@ -218,7 +218,7 @@ else if (localRepositoryMode == LocalRepositoryMode.REPOSITORY_PROXY)

this.validateSubsystemNotConfigured(serverName,
serverTypeClassification.getServerTypeName(),
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(),
openLineageServerConfig);
}

Expand Down Expand Up @@ -253,7 +253,7 @@ else if (localRepositoryMode == LocalRepositoryMode.REPOSITORY_PROXY)

this.validateSubsystemNotConfigured(serverName,
serverTypeClassification.getServerTypeName(),
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(),
openLineageServerConfig);
}

Expand Down Expand Up @@ -288,7 +288,7 @@ else if (localRepositoryMode == LocalRepositoryMode.REPOSITORY_PROXY)

this.validateSubsystemNotConfigured(serverName,
serverTypeClassification.getServerTypeName(),
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(),
openLineageServerConfig);
}

Expand Down Expand Up @@ -358,7 +358,7 @@ else if (localRepositoryMode == LocalRepositoryMode.REPOSITORY_PROXY)

this.validateSubsystemNotConfigured(serverName,
serverTypeClassification.getServerTypeName(),
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(),
openLineageServerConfig);
}

Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/odpi/openmetadata/adminservices/server/OMAGServerConfigOpenLineage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
public class OMAGServerConfigOpenLineage {
private final OMAGServerAdminStoreServices configStore = new OMAGServerAdminStoreServices();

private static final String serviceName = GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName();
private static final String serviceName = GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName();
private static final String defaultInTopicName = "inTopic";


Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/odpi/openmetadata/frameworkservices/gaf/server/spring/OpenGovernanceResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class OpenGovernanceResource


/* =====================================================================================================================
* A governance action governanceActionType describes a step in a governance action process
* A governance action type describes a step in a governance action process
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion ...penmetadata/governanceservers/openlineage/admin/OpenLineageServerOperationalServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private void initializeOLS(OpenLineageServerConfig openLineageServerConfig) thro
this.openLineageServerInstance = new
OpenLineageServerInstance(
localServerName,
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(),
maxPageSize,
openLineageHandler);

Expand Down
2 changes: 1 addition & 1 deletion ...rg/odpi/openmetadata/governanceservers/openlineage/server/OpenLineageInstanceHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class OpenLineageInstanceHandler extends OMAGServerServiceInstanceHandler {
* Default constructor registers the governance server
*/
OpenLineageInstanceHandler() {
super(GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName());
super(GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName());
}


Expand Down
20 changes: 10 additions & 10 deletions ...ain/java/org/odpi/openmetadata/serveroperations/server/OMAGServerOperationalServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ else if (ServerTypeClassification.INTEGRATION_DAEMON.equals(serverTypeClassifica
*/
else if (ServerTypeClassification.OPEN_LINEAGE_SERVER.equals(serverTypeClassification))
{
instance.setServerServiceActiveStatus(GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(), ServerActiveStatus.STARTING);
instance.setServerServiceActiveStatus(GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(), ServerActiveStatus.STARTING);

OpenLineageServerOperationalServices
operationalOpenLineageServer = new OpenLineageServerOperationalServices(configuration.getLocalServerId(),
Expand All @@ -1153,14 +1153,14 @@ else if (ServerTypeClassification.OPEN_LINEAGE_SERVER.equals(serverTypeClassific
instance.setOpenLineageOperationalServices(operationalOpenLineageServer);
operationalOpenLineageServer.initialize(configuration.getOpenLineageServerConfig(),
operationalRepositoryServices.getAuditLog(
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceCode(),
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceDevelopmentStatus(),
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(),
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceDescription(),
GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceWiki()));
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceCode(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceDevelopmentStatus(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceDescription(),
GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceWiki()));

activatedServiceList.add(GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName());
instance.setServerServiceActiveStatus(GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(), ServerActiveStatus.RUNNING);
activatedServiceList.add(GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName());
instance.setServerServiceActiveStatus(GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(), ServerActiveStatus.RUNNING);
}
}

Expand Down Expand Up @@ -1340,11 +1340,11 @@ public void deactivateRunningServiceInstances(String u
*/
if (instance.getOpenLineageOperationalServices() != null)
{
instance.setServerServiceActiveStatus(GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(), ServerActiveStatus.STOPPING);
instance.setServerServiceActiveStatus(GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(), ServerActiveStatus.STOPPING);

instance.getOpenLineageOperationalServices().shutdown();

instance.setServerServiceActiveStatus(GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(), ServerActiveStatus.INACTIVE);
instance.setServerServiceActiveStatus(GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(), ServerActiveStatus.INACTIVE);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion ...a-resources/open-metadata-deployment/sample-configs/view-server/config/view-server.config
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ...orm-report/src/main/java/org/odpi/openmetadata/reports/platform/EgeriaPlatformReport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,18 +610,18 @@ void setConfiguration(OMAGServerConfig configuration)

if (configuration.getOpenLineageServerConfig() != null)
{
OMAGServiceDetails currentDetails = serviceDetailsMap.get(GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName());
OMAGServiceDetails currentDetails = serviceDetailsMap.get(GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName());

if (currentDetails == null)
{
currentDetails = new OMAGServiceDetails(GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName());
currentDetails = new OMAGServiceDetails(GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName());
}

currentDetails.setPartnerService(configuration.getOpenLineageServerConfig().getAccessServiceConfig().getServerName(),
configuration.getOpenLineageServerConfig().getAccessServiceConfig().getServerPlatformUrlRoot(),
AccessServiceDescription.ASSET_LINEAGE_OMAS.getAccessServiceFullName());

serviceDetailsMap.put(GovernanceServicesDescription.OPEN_LINEAGE_SERVICES.getServiceName(),
serviceDetailsMap.put(GovernanceServicesDescription.LINEAGE_WAREHOUSE_SERVICES.getServiceName(),
currentDetails);
}
}
Expand Down

0 comments on commit b8e3357

Please sign in to comment.