Merge pull request #11289 from g-pan/H19767-ConfigLogViz

HPCC-19767 Configuring Log Visualization

Reviewed-By: Rodrigo Pastrana <rodrigo.pastrana@lexisnexis.com>
Reviewed-By: Jim DeFabia <james.defabia@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/scm/ws_elk.ecm

@@ -9,7 +9,7 @@ ESPResponse GetConfigDetailsResponse
     string KibanaPort;
     string KibanaEntryPointURI;
     boolean ReportElasticSearchHealth;
-    string ElasticSearchAdresses;
+    string ElasticSearchAddresses;
     string ElasticSearchPort;
     boolean ReportLogStashHealth;
     string LogStashAddress;

esp/services/ws_elk/WsELKService.cpp

@@ -39,13 +39,13 @@ bool Cws_elkEx::onGetConfigDetails(IEspContext &context, IEspGetConfigDetailsReq
         resp.setKibanaEntryPointURI(kibanacfgentry.str());
         m_serviceCfg->getProp("ELKIntegration/ElasticSearch/@reportElasticHealth", kibanacfgentry.clear());
         resp.setReportElasticSearchHealth(kibanacfgentry.str());
-        m_serviceCfg->getProp("ELKIntegration/ElasticSearch/@elasticSearchAdresses", kibanacfgentry.clear());
-        resp.setElasticSearchAdresses(kibanacfgentry.str());
+        m_serviceCfg->getProp("ELKIntegration/ElasticSearch/@elasticSearchAddresses", kibanacfgentry.clear());
+        resp.setElasticSearchAddresses(kibanacfgentry.str());
         m_serviceCfg->getProp("ELKIntegration/ElasticSearch/@elasticSearchPort", kibanacfgentry.clear());
         resp.setElasticSearchPort(kibanacfgentry.str());
         m_serviceCfg->getProp("ELKIntegration/LogStash/@reportLogStashHealth", kibanacfgentry.clear());
         resp.setReportLogStashHealth(kibanacfgentry.str());
-        m_serviceCfg->getProp("ELKIntegration/LogStash/@logStashAdresses", kibanacfgentry.clear());
+        m_serviceCfg->getProp("ELKIntegration/LogStash/@logStashAddresses", kibanacfgentry.clear());
         resp.setLogStashAddress(kibanacfgentry.str());
         m_serviceCfg->getProp("ELKIntegration/LogStash/@logStashPort", kibanacfgentry.clear());
         resp.setLogStashPort(kibanacfgentry.str());

initfiles/componentfiles/configxml/@temp/esp_service_WsSMC.xsl

@@ -600,10 +600,10 @@ This is required by its binding with ESP service '<xsl:value-of select="$espServ
                     <xsl:copy-of select="@integrateKibana|@kibanaAddress|@kibanaPort|@kibanaEntryPointURI"/>
                 </Kibana>
                 <ElasticSearch>
-                    <xsl:copy-of select="@reportElasticHealth|@elasticSearchAdresses|@elasticSearchPort"/>
+                    <xsl:copy-of select="@reportElasticHealth|@elasticSearchAddresses|@elasticSearchPort"/>
                 </ElasticSearch>
                 <LogStash>
-                    <xsl:copy-of select="@reportLogStashHealth|@logStashAdresses|@logStashPort"/>
+                    <xsl:copy-of select="@reportLogStashHealth|@logStashAddresses|@logStashPort"/>
                 </LogStash>
             </ELKIntegration>
         </EspService>

initfiles/componentfiles/configxml/espsmcservice.xsd.in

@@ -169,7 +169,7 @@
             <xs:annotation>
                 <xs:appinfo>
                     <required>true</required>
-                    <tooltip>Declare if Kibana dashboard to be integrated in ECLWatch</tooltip>
+                    <tooltip>Declare if Kibana dashboard is to be integrated in ECLWatch</tooltip>
                 </xs:appinfo>
             </xs:annotation>
         </xs:attribute>
@@ -202,10 +202,10 @@
                 </xs:appinfo>
             </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="logStashAdresses" type="xs:string" use="optional" default="">
+        <xs:attribute name="logStashAddresses" type="xs:string" use="optional" default="">
             <xs:annotation>
                 <xs:appinfo>
-                    <tooltip>Declares the target LogStash nodes' adresses (semicolon seperated)</tooltip>
+                    <tooltip>Declares the target LogStash nodes' addresses (semicolon seperated)</tooltip>
                 </xs:appinfo>
             </xs:annotation>
         </xs:attribute>
@@ -224,10 +224,10 @@
                 </xs:appinfo>
             </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="elasticSearchAdresses" type="xs:string" use="optional" default="">
+        <xs:attribute name="elasticSearchAddresses" type="xs:string" use="optional" default="">
             <xs:annotation>
                 <xs:appinfo>
-                    <tooltip>Declares the target ElasticSearch nodes' adresses (semicolon seperated)</tooltip>
+                    <tooltip>Declares the target ElasticSearch nodes' addresses (semicolon seperated)</tooltip>
                 </xs:appinfo>
             </xs:annotation>
         </xs:attribute>