Added agent configuration collection to verify proper installation. (#…

…378)

* Added collecting agent configuration to check correct installation

* Added condition to add variable to config of agent

* Fixed commit file

config/config.go

@@ -22,7 +22,7 @@ type Config struct {
 	GenerateConfigPeriod                  time.Duration `hcl:"interval_generate_config_seconds"`
 	QueryOptimizationPeriod               time.Duration `hcl:"interval_query_optimization_seconds"`
 	QueryOptimizationCollectSqlTextPeriod time.Duration `hcl:"interval_query_optimization_collect_sqltext_seconds"`
-	MysqlPassword                         string        `hcl:"mysql_password"`
+	MysqlPassword                         string        `hcl:"mysql_password" json:"-"`
 	MysqlUser                             string        `hcl:"mysql_user"`
 	MysqlHost                             string        `hcl:"mysql_host"`
 	MysqlPort                             string        `hcl:"mysql_port"`

install.sh

@@ -477,10 +477,10 @@ printf "\033[37m\n * Saving variables to Releem Agent configuration\033[0m\n"
 
 printf "\033[37m\n - Adding API key to the Releem Agent configuration: $CONF\n\033[0m"
 echo "apikey=\"$apikey\"" | $sudo_cmd tee -a $CONF >/dev/null
-
-printf "\033[37m - Adding Releem Configuration Directory $WORKDIR/conf to Releem Agent configuration: $CONF\n\033[0m"
-echo "releem_cnf_dir=\"$WORKDIR/conf\"" | $sudo_cmd tee -a $CONF >/dev/null
-
+if [ -d "$WORKDIR/conf" ]; then
+    printf "\033[37m - Adding Releem Configuration Directory $WORKDIR/conf to Releem Agent configuration: $CONF\n\033[0m"
+    echo "releem_cnf_dir=\"$WORKDIR/conf\"" | $sudo_cmd tee -a $CONF >/dev/null
+fi
 if [ -n "$MYSQL_LOGIN" ] && [ -n "$MYSQL_PASSWORD" ]; then
     printf "\033[37m - Adding user and password mysql to the Releem Agent configuration: $CONF\n\033[0m"
 	echo "mysql_user=\"$MYSQL_LOGIN\"" | $sudo_cmd tee -a $CONF >/dev/null

metrics/agent.go

@@ -51,6 +51,7 @@ func (Agent *AgentMetricsGatherer) GetMetrics(metrics *models.Metrics) error {
 	output["TotalAllocMemory"] = m.TotalAlloc
 
 	metrics.ReleemAgent.Info = output
+	metrics.ReleemAgent.Conf = *Agent.configuration
 
 	Agent.logger.Debug("CollectMetrics  ", output)
 	return nil

models/models.go

@@ -3,6 +3,8 @@ package models
 import (
 	"database/sql"
 	"sync"
+
+	"github.com/Releem/mysqlconfigurer/config"
 )
 
 type MetricType byte
@@ -44,6 +46,7 @@ type Metrics struct {
 	ReleemAgent struct {
 		Info  MetricGroupValue
 		Tasks MetricGroupValue
+		Conf  config.Config
 	}
 }
 

mysqlconfigurer.sh

@@ -258,6 +258,7 @@ function releem_ps_mysql() {
     then
         printf "\n`date +%Y%m%d-%H:%M:%S`\033[31m The MySQL service failed to restart with error! Check the MySQL error log! \033[0m\n" 
     fi
+    $sudo_cmd /opt/releem/releem-agent -f
     exit "${RESTART_CODE}"
 }