Removed default values for jdbc parameters

Issue-ID: ACUMOS-806

Change-Id: I6df12840de79ad5efa1edac079aaf8856d4e302e
Signed-off-by: parichay gupta <pg0057291@techmahindra.com>

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index e53e240..fb642be 100644 (file)
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -79,6 +79,8 @@ Steps
 
 .. code:: bash
 
 
 .. code:: bash
 

+   $ cd elk-stack
+

    $ ./docker-compose-elk.sh build
 
 
    $ ./docker-compose-elk.sh build
 
 

diff --git a/elk-stack/logstash/pipeline/logstash.conf b/elk-stack/logstash/pipeline/logstash.conf
index 3d15181..334cd1c 100644 (file)
--- a/elk-stack/logstash/pipeline/logstash.conf
+++ b/elk-stack/logstash/pipeline/logstash.conf
@@ -19,78 +19,85 @@ input {
 
 
 jdbc {
 
 
 jdbc {

-          jdbc_driver_library => "${ACUMOS_ELK_JDBC_DRIVER_LIBRARY:/usr/share/logstash/vendor/bundle/mariadb-java-client-2.1.0.jar}"
-       jdbc_driver_class => "${ACUMOS_ELK_JDBC_DRIVER_CLASS:org.mariadb.jdbc.Driver}"
-          jdbc_connection_string => "${ACUMOS_ELK_JDBC_CONNECTION_STRING:jdbc:mariadb://cognita-ist2-vm01-db.eastus.cloudapp.azure.com:3306/acumosist_1_14_0}"
-       jdbc_user => "${ACUMOS_ELK_JDBC_USERNAME:acumos_ro}"
-       jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD:istro2017}"
+          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
        jdbc_validate_connection => true

+          schedule => "* * * * *"

        statement => "SELECT * FROM C_SOLUTION_DOWNLOAD"
        type => "solution_downloaded"
        tags => ["database"]
       }
 jdbc {
        statement => "SELECT * FROM C_SOLUTION_DOWNLOAD"
        type => "solution_downloaded"
        tags => ["database"]
       }
 jdbc {

-           jdbc_driver_library => "${ACUMOS_ELK_JDBC_DRIVER_LIBRARY:/usr/share/logstash/vendor/bundle/mariadb-java-client-2.1.0.jar}"
-       jdbc_driver_class => "${ACUMOS_ELK_JDBC_DRIVER_CLASS:org.mariadb.jdbc.Driver}"
-          jdbc_connection_string => "${ACUMOS_ELK_JDBC_CONNECTION_STRING:jdbc:mariadb://cognita-ist2-vm01-db.eastus.cloudapp.azure.com:3306/acumosist_1_14_0}"
-       jdbc_user => "${ACUMOS_ELK_JDBC_USERNAME:acumos_ro}"
-       jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD:istro2017}"
+           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
        jdbc_validate_connection => true

+          schedule => "* * * * *"

        statement => "SELECT * FROM C_USER"
        type => "no_of_user"
        tags => ["database"]
       }
 jdbc {
        statement => "SELECT * FROM C_USER"
        type => "no_of_user"
        tags => ["database"]
       }
 jdbc {

-          jdbc_driver_library => "${ACUMOS_ELK_JDBC_DRIVER_LIBRARY:/usr/share/logstash/vendor/bundle/mariadb-java-client-2.1.0.jar}"
-       jdbc_driver_class => "${ACUMOS_ELK_JDBC_DRIVER_CLASS:org.mariadb.jdbc.Driver}"
-          jdbc_connection_string => "${ACUMOS_ELK_JDBC_CONNECTION_STRING:jdbc:mariadb://cognita-ist2-vm01-db.eastus.cloudapp.azure.com:3306/acumosist_1_14_0}"
-       jdbc_user => "${ACUMOS_ELK_JDBC_USERNAME:acumos_ro}"
-       jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD:istro2017}"
+          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
        jdbc_validate_connection => true

+          schedule => "* * * * *"

        statement => "SELECT * FROM C_SOLUTION_DEPLOYMENT"
        type => "solution_deployed"
        tags => ["database"]
       }
 jdbc {
        statement => "SELECT * FROM C_SOLUTION_DEPLOYMENT"
        type => "solution_deployed"
        tags => ["database"]
       }
 jdbc {

-          jdbc_driver_library => "${ACUMOS_ELK_JDBC_DRIVER_LIBRARY:/usr/share/logstash/vendor/bundle/mariadb-java-client-2.1.0.jar}"
-       jdbc_driver_class => "${ACUMOS_ELK_JDBC_DRIVER_CLASS:org.mariadb.jdbc.Driver}"
-          jdbc_connection_string => "${ACUMOS_ELK_JDBC_CONNECTION_STRING:jdbc:mariadb://cognita-ist2-vm01-db.eastus.cloudapp.azure.com:3306/acumosist_1_14_0}"
-       jdbc_user => "${ACUMOS_ELK_JDBC_USERNAME:acumos_ro}"
-       jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD:istro2017}"
+          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
        jdbc_validate_connection => true

+          schedule => "* * * * *"

        statement => "SELECT * FROM C_SOLUTION"
        type => "all_solution"
        tags => ["database"]
       }
 jdbc {
        statement => "SELECT * FROM C_SOLUTION"
        type => "all_solution"
        tags => ["database"]
       }
 jdbc {

-          jdbc_driver_library => "${ACUMOS_ELK_JDBC_DRIVER_LIBRARY:/usr/share/logstash/vendor/bundle/mariadb-java-client-2.1.0.jar}"
-       jdbc_driver_class => "${ACUMOS_ELK_JDBC_DRIVER_CLASS:org.mariadb.jdbc.Driver}"
-          jdbc_connection_string => "${ACUMOS_ELK_JDBC_CONNECTION_STRING:jdbc:mariadb://cognita-ist2-vm01-db.eastus.cloudapp.azure.com:3306/acumosist_1_14_0}"
-       jdbc_user => "${ACUMOS_ELK_JDBC_USERNAME:acumos_ro}"
-       jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD:istro2017}"
+          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
        jdbc_validate_connection => true

+          schedule => "* * * * *"

        statement => "SELECT * FROM C_SOLUTION WHERE ACCESS_TYPE_CD='OR'"
        type => "company_model"
        tags => ["database"]
       }
 jdbc {
        statement => "SELECT * FROM C_SOLUTION WHERE ACCESS_TYPE_CD='OR'"
        type => "company_model"
        tags => ["database"]
       }
 jdbc {

-          jdbc_driver_library => "${ACUMOS_ELK_JDBC_DRIVER_LIBRARY:/usr/share/logstash/vendor/bundle/mariadb-java-client-2.1.0.jar}"
-       jdbc_driver_class => "${ACUMOS_ELK_JDBC_DRIVER_CLASS:org.mariadb.jdbc.Driver}"
-          jdbc_connection_string => "${ACUMOS_ELK_JDBC_CONNECTION_STRING:jdbc:mariadb://cognita-ist2-vm01-db.eastus.cloudapp.azure.com:3306/acumosist_1_14_0}"
-       jdbc_user => "${ACUMOS_ELK_JDBC_USERNAME:acumos_ro}"
-       jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD:istro2017}"
+          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
        jdbc_validate_connection => true

+          schedule => "* * * * *"

        statement => "SELECT * FROM C_SOLUTION WHERE ACCESS_TYPE_CD='PB'"
        type => "public_model"
        tags => ["database"]
       }
 jdbc {
        statement => "SELECT * FROM C_SOLUTION WHERE ACCESS_TYPE_CD='PB'"
        type => "public_model"
        tags => ["database"]
       }
 jdbc {

-          jdbc_driver_library => "${ACUMOS_ELK_JDBC_DRIVER_LIBRARY:/usr/share/logstash/vendor/bundle/mariadb-java-client-2.1.0.jar}"
-       jdbc_driver_class => "${ACUMOS_ELK_JDBC_DRIVER_CLASS:org.mariadb.jdbc.Driver}"
-          jdbc_connection_string => "${ACUMOS_ELK_JDBC_CONNECTION_STRING:jdbc:mariadb://cognita-ist2-vm01-db.eastus.cloudapp.azure.com:3306/acumosist_1_14_0}"
-       jdbc_user => "${ACUMOS_ELK_JDBC_USERNAME:acumos_ro}"
-       jdbc_password => "${ACUMOS_ELK_JDBC_PASSWORD:istro2017}"
+          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
        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"
        type => "name_model"
        tags => ["database"]
        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"
        type => "name_model"
        tags => ["database"]