add process.env

.env

@@ -6,8 +6,10 @@ POSTGRES_PORT = 5432
 PGADMIN_DEFAULT_EMAIL = user@user
 PGADMIN_DEFAULT_PASSWORD = password
 PGADMIN_PORT = 8888
-#SALT_USER = saltuser
-#SALT_PASSWORD = password
+SALT_URL = http://54.151.166.113:8000
+SALT_USER = saltuser
+SALT_PASSWORD = saltpassword
+SALT_EAUTH = pam
 CLOUDBEAVER_AUTH_PROXY_PROVIDER_URI=http://localhost:8978
 CLOUDBEAVER_ADMIN_USERNAME=admin
 CLOUDBEAVER_ADMIN_PASSWORD=admin

index.js

-// import { Salt } from "salt-api";
 const { Salt } = require("salt-api");
 const pg = require("pg");
 const saltdb_v2 = require("./saltdb_v2.js")
-// const cpu = require("./cpu.js")
-// const express = require("express");
-// const salt_stack = require("./database/salt_stack.js")
-
-
+const dotenv = require('dotenv');
 const { Pool, Client } = pg
-
+dotenv.config()
 const salt = new Salt({
-	url: "http://54.151.166.113:8000",
-	username: "saltuser",
-	password: "saltpassword",
-	eauth: "pam"
+	url: process.env.SALT_URL,
+	username: process.env.SALT_USER,
+	password: process.env.SALT_PASSWORD,
+	eauth: process.env.SALT_EAUTH
 });
 
 const client = new Client({
-	user: 'user',
-	password: 'password',
-	host: '54.151.166.113',
-	port: '5432',
-	database: 'postgres',
+	user: process.env.POSTGRES_USER,
+	password: process.env.POSTGRES_PASSWORD,
+	host: process.env.POSTGRES_ENDPOINT,
+	port: process.env.POSTGRES_PORT,
+	database: process.env.POSTGRES_DB,
 });
 const saltDB = new saltdb_v2(salt, client);
-// const saltStack = new salt_stack(client)
-// const app = express()
-// const port = 8505;
 
 client
 	.connect()

saltdb_v2.js

 
 // const request = require('request');
-const dotenv = require('dotenv');
+// const dotenv = require('dotenv');
 const EventEmitter = require('node:events');
 const salt_stack_v2 = require('./database/salt_stack_v2.js');
 
@@ -61,7 +61,7 @@ class saltdb_v2 {
         try {
             const response = await new Promise((resolve, reject) => {
                     this.salt_stack.update_status_user(uuid, status, time).then(data => {
-                        console.log('update success');
+                        // console.log('update success');
                         resolve(data);
                     }).catch( (err) => {
                         // console.log('update status user');
@@ -135,7 +135,7 @@ class saltdb_v2 {
                     this.salt_stack.insert_logs_cpu(user_id, persent_cpu_used,vcpu, time).then(data => {
                         resolve(data);
                     }).catch( (err) => {
-                        console.log(err);
+                        // console.log(err);
                         reject(err);
                     })
             })
@@ -248,11 +248,11 @@ class saltdb_v2 {
                     var time = data._stamp.split('T')[0] + " " + data._stamp.split('T')[1].split('.')[0]
                     var user_id = data.id
                     var loadavg = all.loadavg
-                    console.log(all);
+                    // console.log(all);
                     let kB = 9.5367
                     if (cpustats.cpu != undefined) {
                         var cpu = cpustats.cpu
-                        console.log("cpu====>", cpu);
+                        // console.log("cpu====>", cpu);
                         const idle = cpu.idle
                         const softirq = cpu.softirq
                         const iowait = cpu.iowait
@@ -272,7 +272,7 @@ class saltdb_v2 {
                             if (cpustats[e] != undefined) {
                                 // console.log(e);
                                 const core = e
-                                console.log(core);
+                                // console.log(core);
                                 const value = cpustats[e]
                                 
                                 vcpu.push([core,value])
@@ -286,20 +286,20 @@ class saltdb_v2 {
                         this.update_spec_cpu(user_id,gb_total_cpu,time)
                     }
                     if (meminfo.MemTotal != undefined) {
-                        console.log(meminfo);
+                        // console.log(meminfo);
                         let MemTotal = parseFloat(meminfo.MemTotal.value)
                         let MemFree = parseFloat(meminfo.MemFree.value)
                         let Cached = parseFloat(meminfo.Cached.value)
                         let Buffers = parseFloat(meminfo.Buffers.value)
                         let MemAvailable = parseFloat(meminfo.MemAvailable.value)
-                        console.log("MemTotal===>",MemTotal);
-                        console.log("MemAvailable==>",MemAvailable);
+                        // console.log("MemTotal===>",MemTotal);
+                        // console.log("MemAvailable==>",MemAvailable);
                         let MemUse = MemTotal - (MemFree + Cached + Buffers)
                         let percent_mem = (MemUse / MemTotal) * 100
                         let percent_mem_ava = (MemAvailable / MemTotal) * 100
                         let gb_total_mem = (MemTotal * kB) / 10000000
-                        console.log("percent_mem_ava====>", percent_mem_ava);
-                        console.log("percent_mem====>", percent_mem);
+                        // console.log("percent_mem_ava====>", percent_mem_ava);
+                        // console.log("percent_mem====>", percent_mem);
                         this.insert_mem(user_id, percent_mem,Cached,Buffers,percent_mem_ava, time)
                         this.update_spec_mem(user_id,gb_total_mem,time)
                         
@@ -309,9 +309,9 @@ class saltdb_v2 {
                         let one_min = load_avg[0][1]
                         let five_min = load_avg[1][1]
                         let fifteen_min = load_avg[2][1]
-                        console.log(one_min);
-                        console.log(five_min);
-                        console.log(fifteen_min);
+                        // console.log(one_min);
+                        // console.log(five_min);
+                        // console.log(fifteen_min);
                         this.insert_load(user_id, one_min, five_min, fifteen_min, time)
                     }
                     this.check_status_minion(user_id, time)