server launches with proper config for itself and grafana, added storing config on exit or changes

main
Keegan 2 years ago
parent 429ce92207
commit 1c2868daf8

@ -1,17 +1,20 @@
package main
import (
_"net/http"
"fmt"
_ "net/http"
_ "net/http/pprof"
"os/signal"
"strconv"
"strings"
"syscall"
//"flag"
//"log"
"os"
"fmt"
"FRMS/internal/pkg/logging"
"FRMS/internal/pkg/config"
"FRMS/internal/pkg/logging"
"FRMS/internal/pkg/server"
"os"
)
type coordinator interface {
@ -29,6 +32,7 @@ func LoadConfig(fname string) Config {
type Config interface {
UpdatePort(string, int) error
Store() error
}
func main() {
@ -37,34 +41,44 @@ func main() {
// go func() {
// fmt.Println(http.ListenAndServe("localhost:6060",nil))
// }()
gracefulShutdown := make(chan os.Signal, 1)
signal.Notify(gracefulShutdown, syscall.SIGINT, syscall.SIGTERM)
conf := LoadConfig("server")
ch := make(chan error)
errCh := make(chan error)
// checking env
envVars := os.Environ()
for _, envString := range envVars {
// looping over set ports
initSplt := strings.Split(envString,"=")
initSplt := strings.Split(envString, "=")
key := initSplt[0]
val := initSplt[1]
if strings.Contains(key,"PORT") {
if strings.Contains(key, "PORT") {
// parsing out correct port to update
splt := strings.Split(key,"_") // LIS_PORT -> LIS, PORT
splt := strings.Split(key, "_") // LIS_PORT -> LIS, PORT
portName := strings.ToLower(splt[0]) // LIS -> lis
port, err := strconv.Atoi(val)
if err != nil {
panic(err)
}
if err := conf.UpdatePort(portName,port); err != nil {
if err := conf.UpdatePort(portName, port); err != nil {
panic(err)
}
}
}
//fmt.Printf("Listening on %v\n", lport)
c := NewCoordinator(ch)
c := NewCoordinator(errCh)
go c.Start()
fmt.Println("Server Active!")
logging.Debug(logging.DStart, "CCO 01 Server started")
err := <-ch // blocking to wait for any errors and keep alive otherwise
select {
case err := <-errCh: // blocking to wait for any errors and keep alive otherwise
panic(err)
case <-gracefulShutdown:
err := conf.Store()
if err != nil {
panic(err)
}
fmt.Println("Stored config successfully. Exiting...")
os.Exit(0)
}
}

@ -8,12 +8,16 @@ services:
ports:
- "2022:2022"
- "2023:2023"
- "2024:2024"
volumes:
- ./logs:/log
- server-config:/configs
- server-config:/etc/frms/config
environment:
- LOGTYPE=SERVER
- VERBOSE=1
- LIS_PORT=2022
- REACTOR_PORT=2023
- TUI_PORT=2024
depends_on:
- db
db:
@ -32,7 +36,7 @@ services:
- DOCKER_INFLUXDB_INIT_USERNAME=admin
- DOCKER_INFLUXDB_INIT_PASSWORD=F0r3l1ght
- DOCKER_INFLUXDB_INIT_ORG=ForeLight
- DOCKER_INFLUXDB_INIT_BUCKET=default
- DOCKER_INFLUXDB_INIT_BUCKET=test
grafana:
image: grafana/grafana-oss:latest
ports:
@ -40,6 +44,8 @@ services:
volumes:
- grafana-provisioning:/etc/grafana/provisioning
- grafana-data:/var/lib/grafana
depends_on:
- db
volumes:
grafana-data:
grafana-provisioning:

@ -1,12 +1,14 @@
#!/bin/bash
#DB_URL=$(cat "$INFLUX_CONFIGS_PATH" | awk '/url/ {print $3}' | head -n 1)
DB_URL="frms-db-1:8086"
TOKEN=$(influx auth list --user ${DOCKER_INFLUXDB_INIT_USER_ID} --hide-headers | cut -f 3)
ORG=$(influx org list | grep ${DOCKER_INFLUXDB_INIT_ORG_ID} | awk '{print $2}')
# creating starting server YAML
echo -e "server:\n\tdb-url:${INFLUX_HOST}\n\tdb-org:${ORG}\n\tdb-token:${TOKEN}" >/configs/server.yaml;
echo -e "server:\n db-url: ${DB_URL}\n db-org: ${ORG}\n db-token: ${TOKEN}" >/configs/server.yaml;
# creating grafana yaml
influx user create -n grafana -o ${ORG}
GRAFANA_USER_ID=$(influx user list --hide-headers --name grafana)
GRAFANA_TOKEN=$(influx auth list --user ${GRAFANA_USER_ID} --hide-headers | cut -f 3)
echo -e "datasources:\n\t- name: INFLUXDB\n\ttype: influxdb\n\turl:${INFLUX_HOST}\n\tdatabase: test\n\t jsonData:\n\t\thttpMode: GET\n\t\thttpHeaderName1: 'Authorization'\n\tsecureJsonData:\n\t\thttpHeaderValue1: 'Token ${GRAFANA_TOKEN}'"
GRAFANA_TOKEN=$(influx auth list --user grafana --hide-headers | cut -f 3)
echo -e "apiVersion: 1\n\ndeleteDatasources:\n\ndatasources:\n - name: INFLUXDB\n type: influxdb\n access: proxy\n url: ${DB_URL}\n jsonData:\n httpMode: GET\n httpHeaderName1: 'Authorization'\n secureJsonData:\n httpHeaderValue1: 'Token ${GRAFANA_TOKEN}'" >/grafana/datasources/datasource.yaml

@ -3,13 +3,14 @@ package config
// package serves to store/load config files for server
import (
"fmt"
"strconv"
"github.com/spf13/viper"
"FRMS/internal/pkg/logging"
"errors"
"sync"
"fmt"
"strconv"
"strings"
"sync"
"github.com/spf13/viper"
//"os"
//"log"
//"os/exec"
@ -44,20 +45,22 @@ func Load(fname string) {
C = &Config{}
viper.SetConfigName(fname)
viper.SetConfigType("yaml")
viper.AddConfigPath("./configs")
//viper.AddConfigPath("../../internal/configs")
viper.AddConfigPath("/etc/frms/config") //
// defaults
viper.SetDefault("server.db-org", "ForeLight")
viper.SetDefault("server.db-url", "http://192.168.100.2:8086")
// unmarshalling
viper.ReadInConfig() // the fact i never did this is infuriating
logging.Debug(logging.DStart,"CON Loaded configs from %v", viper.ConfigFileUsed())
err := viper.Unmarshal(C)
err := viper.ReadInConfig() // the fact i never did this is infuriating
if err != nil {
logging.Debug(logging.DError,"Cannot unmarshall Server! %v",err)
panic(err)
}
fmt.Printf("Outcome: %#v\n \n",C)
logging.Debug(logging.DStart, "CON Loaded configs from %v", viper.ConfigFileUsed())
err = viper.Unmarshal(C)
if err != nil {
logging.Debug(logging.DError, "Cannot unmarshall Server! %v", err)
panic(err)
}
fmt.Printf("Outcome: %#v\n \n", C)
//fmt.Printf("%v\n",C)
// unmarshalled at this point
}
@ -84,7 +87,7 @@ func (c *Config) GetPort(port string) (int, error) {
portString, ok := c.Server.Ports[port]
if !ok {
portEnv := strings.ToUpper(port) + "_PORT"
return 0, fmt.Errorf("%s port doesnt exist! Please set using env %s=####",port, portEnv)
return 0, fmt.Errorf("%s port doesnt exist! Please set using env %s=####", port, portEnv)
}
// returns int, err
//return strconv.Atoi(portString)
@ -100,11 +103,11 @@ func (c *Config) GetServerToken() (string, error) {
func (c *Config) GetReactorClient(id uint32) (string, string, error) {
c.RLock()
defer c.RUnlock()
idString := strconv.FormatUint(uint64(id),10)
idString := strconv.FormatUint(uint64(id), 10)
if r, ok := c.Reactors[idString]; ok {
return r.Bucket, r.Token, nil
}
return "", "", fmt.Errorf("Reactor %v config doesnt exist!",id)
return "", "", fmt.Errorf("Reactor %v config doesnt exist!", id)
}
// setters
@ -115,7 +118,8 @@ func (c *Config) UpdateURL(url string) error {
return errors.New("String cannot be empty!")
}
c.Server.URL = url
return viper.WriteConfig()
viper.Set("server.db-url", url)
return viper.WriteConfigAs(viper.ConfigFileUsed())
}
func (c *Config) UpdateOrg(org string) error {
@ -125,7 +129,8 @@ func (c *Config) UpdateOrg(org string) error {
return errors.New("String cannot be empty!")
}
c.Server.Orginization = org
return viper.WriteConfig()
viper.Set("server.db-org", org)
return viper.WriteConfigAs(viper.ConfigFileUsed())
}
func (c *Config) UpdatePort(pName string, port int) error {
@ -133,10 +138,15 @@ func (c *Config) UpdatePort(pName string, port int) error {
defer c.Unlock()
if port < 1024 || port > 65535 {
// OOB
return fmt.Errorf("Port %d out of bounds! [1024,65535]",port)
return fmt.Errorf("Port %d out of bounds! [1024,65535]", port)
}
if c.Server.Ports == nil {
c.Server.Ports = make(map[string]int)
}
c.Server.Ports[pName] = port
return nil
pname := fmt.Sprintf("server.ports.%s", pName)
viper.Set(pname, port)
return viper.WriteConfigAs(viper.ConfigFileUsed())
}
func (c *Config) UpdateServerToken(token string) error {
@ -146,7 +156,8 @@ func (c *Config) UpdateServerToken(token string) error {
return errors.New("String cannot be empty!")
}
c.Server.Token = token
return viper.WriteConfig()
viper.Set("server.token", token)
return viper.WriteConfigAs(viper.ConfigFileUsed())
}
func (c *Config) UpdateReactorClient(id uint32, bucket, token string) error {
@ -157,12 +168,19 @@ func (c *Config) UpdateReactorClient(id uint32, bucket, token string) error {
return errors.New("String cannot be empty!")
}
if reactor, ok := c.Reactors[sid]; !ok {
c.Reactors[sid] = ReactorConfig{Token:token,Bucket:bucket,Id:id}
c.Reactors[sid] = ReactorConfig{Token: token, Bucket: bucket, Id: id}
} else {
reactor.Bucket = bucket
reactor.Token = token
c.Reactors[sid] = reactor
}
return viper.WriteConfig()
reactorbucket := fmt.Sprintf("%s.db-bucket", id)
reactortoken := fmt.Sprintf("%s.db-token", id)
viper.Set(reactorbucket, bucket)
viper.Set(reactortoken, token)
return viper.WriteConfigAs(viper.ConfigFileUsed())
}
func (c *Config) Store() error {
return viper.WriteConfigAs(viper.ConfigFileUsed())
}

@ -7,6 +7,7 @@ import (
type DBClient struct {
URL string
Org string
Bucket string
Token string
// Client *influxdb2.Client
@ -17,18 +18,29 @@ type DBAdmin struct {
*DBClient
}
func NewDBClient(url, bucket, token string) *DBClient {
db := &DBClient{URL:url, Bucket:bucket, Token:token}
func NewDBClient(url, org, token string) *DBClient {
db := &DBClient{URL:url, Org:org, Token:token}
return db
}
func NewDBAdmin(url, bucket, token string) *DBAdmin {
func NewDBAdmin(url, org, token string) *DBAdmin {
admin := &DBAdmin{}
admin.DBClient = NewDBClient(url, bucket, token)
admin.DBClient = NewDBClient(url, org, token)
return admin
}
// base level funcs
func (d *DBClient) Start() {
// connect to DB
// d.Client = influxdb2.NewClient(d.URL,d.Token)
}
func (d *DBAdmin) GetReactorClient(id string) (string, string, error) {
// given an id returns associated token and bucket
client := influxdb2.NewClient(d.URL,d.Token)
defer client.Close()
bucket, err := client.BucketsAPI().FindBucketByName(context.Background(),id)
if err != nil {
return "", "", err
}
if d.ReactorExists(id) {
// get corresponding reactor token and bucket

@ -1,17 +1,18 @@
package server
import (
"sync"
"fmt"
"net"
"context"
"errors"
"FRMS/internal/pkg/logging"
"google.golang.org/grpc"
pb "FRMS/internal/pkg/grpc"
"FRMS/internal/pkg/config"
pb "FRMS/internal/pkg/grpc"
"FRMS/internal/pkg/influxdb"
_ "FRMS/internal/pkg/influxdb"
"FRMS/internal/pkg/logging"
"context"
"errors"
"fmt"
"net"
"sync"
"google.golang.org/grpc"
)
// this package creates the central coordiantor and sub coordiantors for clients
@ -33,26 +34,25 @@ type Config interface { // PROPOSED RENAMING: ServerConfig to avoid confusion w/
GetReactorClient(uint32) (string, string, error) // ret (bucket, token, err)
// setters
// save on write
UpdateURL(string) error
UpdateOrg(string) error
UpdateServerToken(string) error
//UpdateURL(string) error
//UpdateOrg(string) error
//UpdateServerToken(string) error
UpdateReactorClient(uint32, string, string) error // call (id, bucket, token)
}
// db client interface
type DB interface{
type DB interface {
// getters (all create if doesnt exist)
GetToken() (string, error) // returns admin token (Creates if it doesnt exist)
GetReactorClient(uint32) (string, string, error) // returns (bucket, token, err)
//GetToken() (string, error) // returns admin token (Creates if it doesnt exist)
GetReactorClient(string) (string, string, error) // returns (bucket, token, err)
// delete
DeleteReactorClient(uint32) error // removes client token but maintains bucket
PurgeReactorClientData(uint32) error // perm deletes all assocaited reactor data (token, bucket etc)
DeleteReactorClient(string) error // removes client token but maintains bucket
PurgeReactorClientData(string) error // perm deletes all assocaited reactor data (token, bucket etc)
}
/*func NewDBClient() DBClient {
return influxdb.NewServerClient()
}*/
func NewDBAdmin(url, org, token string) DB {
return influxdb.NewDBAdmin(token, org, url)
}
type CentralCoordinator struct {
ClientConnections *ClientPacket
@ -65,7 +65,7 @@ type CentralCoordinator struct {
}
type SubCoordinators struct {
Directory map [string]*SubCoordinator
Directory map[string]*SubCoordinator
sync.Mutex
}
@ -74,7 +74,7 @@ func NewCentralCoordinator(ch chan error) *CentralCoordinator {
c.SystemViewer = NewSystemViewer()
go c.SystemViewer.Start()
s := make(map[string]*SubCoordinator)
sub := &SubCoordinators{Directory:s}
sub := &SubCoordinators{Directory: s}
c.SubCoordinators = sub
return c
}
@ -84,7 +84,7 @@ func (c *CentralCoordinator) Start() {
// begin with config and client
c.LoadCfg()
clientChan := make(chan *ClientPacket)
l := NewListener(clientChan,c.Err)
l := NewListener(clientChan, c.Err)
go l.Start()
go c.ClientListener(clientChan)
@ -95,30 +95,18 @@ func (c *CentralCoordinator) LoadCfg() {
c.Config = LoadConfig()
_, err := c.Config.GetURL()
if err != nil {
logging.Debug(logging.DError,"CCO 01 Err: %v", err)
c.Err <-err
logging.Debug(logging.DError, "CCO 01 Err: %v", err)
c.Err <- err
}
token, err := c.Config.GetServerToken()
if err != nil {
logging.Debug(logging.DError,"CCO 01 Err: %v", err)
c.Err <-err
} else if token == "" {
if token, err = c.DB.GetToken(); err != nil {
logging.Debug(logging.DError,"CCO 01 Err: %v", err)
c.Err <-err
}
c.Config.UpdateServerToken(token)
logging.Debug(logging.DError, "CCO 01 Err: %v", err)
c.Err <- err
}
org, err := c.Config.GetOrg()
if err != nil {
logging.Debug(logging.DError,"CCO 01 Err: %v", err)
c.Err <-err
} else if token == "" {
if token, err = c.DB.GetToken(); err != nil {
logging.Debug(logging.DError,"CCO 01 Err: %v", err)
c.Err <-err
}
c.Config.UpdateOrg(org)
logging.Debug(logging.DError, "CCO 01 Err: %v", err)
c.Err <- err
}
}
@ -126,7 +114,7 @@ func (c *CentralCoordinator) ClientListener(ch chan *ClientPacket) {
for client := range ch {
// basically loops until channel is closed
cr := c.ClientHandler(client.Client)
client.Response <-cr
client.Response <- cr
}
}
@ -136,8 +124,8 @@ func (c *CentralCoordinator) ClientHandler(cl *Client) *ClientResponse {
subcoord, ok := c.SubCoordinators.Directory[cl.Type]
if !ok {
// Sub Coordinator does not exists
logging.Debug(logging.DSpawn,"CC0 01 Created %v Coordinator",cl.Type)
subcoord = NewSubCoordinator(cl.Type,c.SystemViewer, c.Err)
logging.Debug(logging.DSpawn, "CC0 01 Created %v Coordinator", cl.Type)
subcoord = NewSubCoordinator(cl.Type, c.SystemViewer, c.Err)
c.SubCoordinators.Directory[cl.Type] = subcoord
}
go subcoord.ClientHandler(cl)
@ -146,31 +134,30 @@ func (c *CentralCoordinator) ClientHandler(cl *Client) *ClientResponse {
var port int
var err error
if url, err = c.Config.GetURL(); err != nil {
logging.Debug(logging.DError,"Error: %v", err)
c.Err <-err
logging.Debug(logging.DError, "Error: %v", err)
c.Err <- err
} else if org, err = c.Config.GetOrg(); err != nil {
logging.Debug(logging.DError,"Error: %v", err)
c.Err <-err
logging.Debug(logging.DError, "Error: %v", err)
c.Err <- err
} else if bucket, token, err = c.Config.GetReactorClient(cl.Id); err != nil {
logging.Debug(logging.DError,"Error: %v", err)
c.Err <-err
logging.Debug(logging.DError, "Error: %v", err)
c.Err <- err
} else if port, err = c.Config.GetPort(cl.Type); err != nil {
logging.Debug(logging.DError,"Error: %v", err)
c.Err <-err
logging.Debug(logging.DError, "Error: %v", err)
c.Err <- err
}
cr := &ClientResponse{URL:url, Org:org, Token:token, Bucket:bucket, Port:port}
cr := &ClientResponse{URL: url, Org: org, Token: token, Bucket: bucket, Port: port}
return cr
}
type ManagerInterface interface {
Start()
NewManager(*Client,*SystemViewer, chan error) GeneralManager
NewManager(*Client, *SystemViewer, chan error) GeneralManager
GetManager(uint32) (GeneralManager, bool)
AddManager(uint32, GeneralManager)
Register()
}
type GeneralManager interface {
// used by sub coordinator to interact with manager
Start()
@ -191,11 +178,11 @@ type Managers struct {
// interface stuff
func NewSubCoordinator(clientType string, sys *SystemViewer, err chan error) *SubCoordinator {
c := &SubCoordinator{Err:err}
c := &SubCoordinator{Err: err}
c.SystemViewer = sys
man, errs := NewCoordinatorType(clientType, err)
if errs != nil {
err <-errs
err <- errs
}
c.ManagerInterface = man
go man.Start()
@ -244,12 +231,12 @@ func NewCoordinatorType(clientType string, err chan error) (ManagerInterface, er
if clientType == "reactor" {
c := &reactorCoordinator{}
//m := make(map[uint32]*ReactorManager)
c.Managers = &Managers{Directory:m}
c.Managers = &Managers{Directory: m}
return c, nil
} else if clientType == "tui" {
c := &tuiCoordinator{}
//m := make(map[uint32]*TUIManager)
c.Managers = &Managers{Directory:m}
c.Managers = &Managers{Directory: m}
return c, nil
}
return &reactorCoordinator{}, errors.New("Unrecognized client type")
@ -263,12 +250,12 @@ type reactorCoordinator struct {
}
func (r *reactorCoordinator) Start() {
logging.Debug(logging.DStart,"RCO 01 Starting!")
logging.Debug(logging.DStart, "RCO 01 Starting!")
}
func (r *reactorCoordinator) NewManager(cl *Client, sys *SystemViewer, err chan error) GeneralManager {
logging.Debug(logging.DClient, "RCO 01 starting manager for %v client %v",cl.Type,cl.Id)
return NewReactorManager(cl,sys,err)
logging.Debug(logging.DClient, "RCO 01 starting manager for %v client %v", cl.Type, cl.Id)
return NewReactorManager(cl, sys, err)
}
func (r *reactorCoordinator) Register() {
@ -277,12 +264,12 @@ func (r *reactorCoordinator) Register() {
if err != nil {
panic(err)
}
lis, err := net.Listen("tcp", fmt.Sprintf(":%v",port))
lis, err := net.Listen("tcp", fmt.Sprintf(":%v", port))
if err != nil {
panic(err)
}
grpcServer := grpc.NewServer()
pb.RegisterMonitoringServer(grpcServer,r)
pb.RegisterMonitoringServer(grpcServer, r)
go grpcServer.Serve(lis)
logging.Debug(logging.DClient, "RCO ready for client requests")
}
@ -306,12 +293,12 @@ type tuiCoordinator struct {
}
func (t *tuiCoordinator) Start() {
logging.Debug(logging.DStart,"TCO 01 Starting!")
logging.Debug(logging.DStart, "TCO 01 Starting!")
}
func (t *tuiCoordinator) NewManager(cl *Client, sys *SystemViewer, err chan error) GeneralManager {
logging.Debug(logging.DClient, "TCO 01 starting manager for %v client %v",cl.Type,cl.Id)
return NewTUIManager(cl,sys,err)
logging.Debug(logging.DClient, "TCO 01 starting manager for %v client %v", cl.Type, cl.Id)
return NewTUIManager(cl, sys, err)
}
func (t *tuiCoordinator) Register() {
@ -320,12 +307,12 @@ func (t *tuiCoordinator) Register() {
if err != nil {
panic(err)
}
lis, err := net.Listen("tcp", fmt.Sprintf(":%v",port))
lis, err := net.Listen("tcp", fmt.Sprintf(":%v", port))
if err != nil {
// rip
}
grpcServer := grpc.NewServer()
pb.RegisterManagementServer(grpcServer,t)
pb.RegisterManagementServer(grpcServer, t)
go grpcServer.Serve(lis)
logging.Debug(logging.DClient, "TCO ready for client requests")
}
@ -341,7 +328,7 @@ func (t *tuiCoordinator) GetDevices(ctx context.Context, req *pb.GetDevicesReque
if !ok {
return &pb.GetDevicesResponse{}, errors.New("Manager is not of type TUI")
}
return tm.GetDevices(ctx,req)
return tm.GetDevices(ctx, req)
}
// unimplemented bs for grpc
@ -354,4 +341,3 @@ func (t *tuiCoordinator) DeleteReactorDevice(ctx context.Context, req *pb.Delete
// TODO
return &pb.DeleteReactorDeviceResponse{}, nil
}

Loading…
Cancel
Save