Added query for solution revision table 17/2617/1
authorGUPTA <pg0057291@techmahindra.com>
Mon, 20 Aug 2018 16:21:38 +0000 (12:21 -0400)
committerGUPTA <pg0057291@techmahindra.com>
Mon, 20 Aug 2018 16:21:38 +0000 (12:21 -0400)
Issue-ID: ACUMOS-1591

Change-Id: I952eb7d9cda1f75e323157dfcbd3721d0f17a787
Signed-off-by: GUPTA <pg0057291@techmahindra.com>
elk-stack/logstash/pipeline/logstash.conf

index 540c7c7..11d129f 100644 (file)
@@ -74,7 +74,19 @@ jdbc {
        jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD}"
        jdbc_validate_connection => true
           schedule => "* * * * *"
-       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'"
+       statement => "SELECT * FROM C_SOLUTION_REV"
+       type => "revision_solution"
+       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 * FROM C_SOLUTION s inner join C_SOLUTION_REV r ON s.SOLUTION_ID = r.SOLUTION_ID AND r.ACCESS_TYPE_CD='OR' and s.ACTIVE_YN ='Y'"
        type => "company_model"
        tags => ["database"]       
       }
@@ -86,7 +98,7 @@ jdbc {
        jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD}"
        jdbc_validate_connection => true
           schedule => "* * * * *"
-       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'"
+       statement => "SELECT * FROM C_SOLUTION s inner join C_SOLUTION_REV r ON s.SOLUTION_ID = r.SOLUTION_ID AND r.ACCESS_TYPE_CD='PB' and s.ACTIVE_YN ='Y'"
        type => "public_model"
        tags => ["database"]
       }
@@ -98,7 +110,7 @@ jdbc {
        jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD}"
        jdbc_validate_connection => true
           schedule => "* * * * *"
-       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'"
+       statement => "SELECT * FROM C_SOLUTION s inner join C_SOLUTION_REV r ON s.SOLUTION_ID = r.SOLUTION_ID AND r.ACCESS_TYPE_CD='PR' and s.ACTIVE_YN ='Y'"
        type => "private_model"
        tags => ["database"]
       }