Update ELK queries for db version 1.17

Issue-ID: ACUMOS-1591

Change-Id: I691ab0771e06faa4bd7909fc79074776f8855e57
Signed-off-by: GUPTA <pg0057291@techmahindra.com>

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 47a37f4..68587f1 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -20,6 +20,11 @@
 Platform Operations, Administration, and Management (OA&M) Release Notes
 ========================================================================
 
+Version 1.2.0, 15 August 2018
+-----------------------------
+
+-  Updated ELK queries to match with database 1.17 version
+
 Version 1.1.0, 27 June 2018
 ---------------------------
 

diff --git a/elk-stack/elasticsearch/pom.xml b/elk-stack/elasticsearch/pom.xml
index d9f08d0..481eb0e 100644 (file)
--- a/elk-stack/elasticsearch/pom.xml
+++ b/elk-stack/elasticsearch/pom.xml
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-elasticsearch</artifactId>
         <!-- docker tag -->
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
 </project>
 
 

diff --git a/elk-stack/kibana/pom.xml b/elk-stack/kibana/pom.xml
index c063f5b..0aafa22 100644 (file)
--- a/elk-stack/kibana/pom.xml
+++ b/elk-stack/kibana/pom.xml
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-kibana</artifactId>
         <!-- docker tag -->
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
 </project>
 
 

diff --git a/elk-stack/logstash/pipeline/logstash.conf b/elk-stack/logstash/pipeline/logstash.conf
index 334cd1c..540c7c7 100644 (file)
--- a/elk-stack/logstash/pipeline/logstash.conf
+++ b/elk-stack/logstash/pipeline/logstash.conf
@@ -74,9 +74,9 @@ jdbc {
        jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD}"
        jdbc_validate_connection => true
           schedule => "* * * * *"
-       statement => "SELECT * FROM C_SOLUTION WHERE ACCESS_TYPE_CD='OR'"
+       statement => "SELECT * FROM C_SOLUTION s, C_SOLUTION_REV r WHERE s.SOLUTION_ID = r.SOLUTION_ID AND r.ACCESS_TYPE_CD='OR' and s.ACTIVE_YN ='Y'"
        type => "company_model"
-       tags => ["database"]
+       tags => ["database"]       
       }
 jdbc {
           jdbc_driver_library => "${ACUMOS_ELK_JDBC_DRIVER_LIBRARY}"
@@ -86,7 +86,7 @@ jdbc {
        jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD}"
        jdbc_validate_connection => true
           schedule => "* * * * *"
-       statement => "SELECT * FROM C_SOLUTION WHERE ACCESS_TYPE_CD='PB'"
+       statement => "SELECT * FROM C_SOLUTION s, C_SOLUTION_REV r WHERE s.SOLUTION_ID = r.SOLUTION_ID AND r.ACCESS_TYPE_CD='PB' and s.ACTIVE_YN ='Y'"
        type => "public_model"
        tags => ["database"]
       }
@@ -98,7 +98,31 @@ jdbc {
        jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD}"
        jdbc_validate_connection => true
           schedule => "* * * * *"
-       statement => "select solution.name,CONCAT(user.first_name,' ',user.last_name) from c_solution solution inner join c_user user on user.USER_ID = solution.OWNER_ID"
+       statement => "SELECT * FROM C_SOLUTION s, C_SOLUTION_REV r WHERE s.SOLUTION_ID = r.SOLUTION_ID AND r.ACCESS_TYPE_CD='PR' and s.ACTIVE_YN ='Y'"
+       type => "private_model"
+       tags => ["database"]
+      }
+jdbc {
+          jdbc_driver_library => "${ACUMOS_ELK_JDBC_DRIVER_LIBRARY}"
+       jdbc_driver_class => "${ACUMOS_ELK_JDBC_DRIVER_CLASS}"
+          jdbc_connection_string => "${ACUMOS_ELK_JDBC_CONNECTION_STRING}"
+       jdbc_user => "${ACUMOS_ELK_JDBC_USERNAME}"
+       jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD}"
+       jdbc_validate_connection => true
+          schedule => "* * * * *"
+       statement => "select s.SOLUTION_ID, s.NAME Model_Name, u.First_Name, u.Last_Name, r.ACCESS_TYPE_CD, s.Created_Date, s.Modified_date, s.ACTIVE_YN from C_SOLUTION s, C_USER u, C_SOLUTION_REV r where s.USER_ID = u.USER_ID and s.SOLUTION_ID = r.SOLUTION_ID order by u.Last_Name"
+       type => "solutions"
+       tags => ["database"]
+      }
+jdbc {
+          jdbc_driver_library => "${ACUMOS_ELK_JDBC_DRIVER_LIBRARY}"
+       jdbc_driver_class => "${ACUMOS_ELK_JDBC_DRIVER_CLASS}"
+          jdbc_connection_string => "${ACUMOS_ELK_JDBC_CONNECTION_STRING}"
+       jdbc_user => "${ACUMOS_ELK_JDBC_USERNAME}"
+       jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD}"
+       jdbc_validate_connection => true
+          schedule => "* * * * *"
+       statement => "select solution.name,CONCAT(user.first_name,' ',user.last_name) from c_solution solution inner join c_user user on user.USER_ID = solution.USER_ID"
        type => "name_model"
        tags => ["database"]
       }

diff --git a/elk-stack/logstash/pom.xml b/elk-stack/logstash/pom.xml
index 722bf28..9e94b90 100644 (file)
--- a/elk-stack/logstash/pom.xml
+++ b/elk-stack/logstash/pom.xml
@@ -25,5 +25,5 @@
         <!-- docker image name -->
         <artifactId>acumos-logstash</artifactId>
         <!-- docker tag -->
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
 </project>

diff --git a/filebeat/pom.xml b/filebeat/pom.xml
index cc6abc5..c55dce4 100644 (file)
--- a/filebeat/pom.xml
+++ b/filebeat/pom.xml
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-filebeat</artifactId>
         <!-- docker tag -->
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
 </project>
 
 

diff --git a/metricbeat/pom.xml b/metricbeat/pom.xml
index 2e86ca9..bee6357 100644 (file)
--- a/metricbeat/pom.xml
+++ b/metricbeat/pom.xml
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-metricbeat</artifactId>
         <!-- docker tag -->
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
 </project>