grafana fixes

README.md

@@ -7,15 +7,22 @@ curl -fsSL https://bun.sh/install | bash
 To build the client:
 ```sh
 cd client
+bun install
 bun run exe
 ```
 
 To run the server:
 ```sh
 cd server
+bun install
+# clone .env from .env.example and fill in variables
 bun start
 ```
 
 The provided docker-compose file sets up a PostgreSQL server and a Grafana instance.
 There is also a Grafana dashboard JSON file for an example use of the data.
 Make sure to import the `server/schema.sql` into PostgreSQL before using it.
+You can import the datasource into grafana with the command:
+```sh
+curl -X "POST" "http://localhost:3000/api/datasources" -H "Content-Type: application/json" --user admin:admin --data-binary @grafana-datasource.json
+```

client/index.ts

@@ -8,6 +8,8 @@ import MDBReader from 'mdb-reader';
 import { diff } from 'just-diff';
 import { version } from './package.json';
 
+console.log(`FDLogUp Client v${version}`);
+
 const rl = readline.createInterface({
 	input: process.stdin,
 	output: process.stdout
@@ -115,8 +117,5 @@ process.on("SIGINT", () => {
 });
 rl.close();
 
-
-console.log(`FDLogUp Client v${version}`);
-
 // "Upload first" option
 if (process.argv[2] === '--upload') _upload();

docker-compose.yml

@@ -27,7 +27,7 @@ services:
     environment:
       - GF_INSTALL_PLUGINS=orchestracities-map-panel
     volumes:
-      - ./grafana:/var/lib/grafana
+      - grafana:/var/lib/grafana
 
 volumes:
   postgres:

grafana-dashboard.json

@@ -846,7 +846,7 @@
   "timepicker": {},
   "timezone": "browser",
   "title": "Field Day Contest",
-  "uid": "fdpbhdsbrhs74f",
+  "uid": "arrlfielddaycontest",
   "version": 11,
   "weekStart": ""
 }

grafana-datasource.json

@@ -0,0 +1,26 @@
+{
+	"id": 1,
+	"uid": "edpbbm8hqv9j4e",
+	"orgId": 1,
+	"name": "PostgreSQL",
+	"type": "grafana-postgresql-datasource",
+	"typeName": "PostgreSQL",
+	"typeLogoUrl": "public/app/plugins/datasource/grafana-postgresql-datasource/img/postgresql_logo.svg",
+	"access": "proxy",
+	"url": "postgres:5432",
+	"user": "fdlogup",
+	"secureJsonData": {"password": "fdlogup"},
+	"database": "",
+	"basicAuth": false,
+	"isDefault": true,
+	"jsonData": {
+		"connMaxLifetime": 14400,
+		"database": "fdlogup",
+		"maxIdleConns": 100,
+		"maxIdleConnsAuto": true,
+		"maxOpenConns": 100,
+		"postgresVersion": 1600,
+		"sslmode": "disable"
+	},
+	"readOnly": false
+}