Додан моніторінг застосунку

Додани веб компоненти карточок територій та повідомлень

README.md

@@ -31,6 +31,9 @@ DOMAIN=sheep-service.com
 HTTP_PORT=4000
 HTTPS_PORT=4001
 
+ADMIN_USER=<тут_твій_нікнейм>
+ADMIN_TOKEN=<тут_твій_токен>
+
 DB_PATH=/home/username/webapps/sheep-service.com/
 CARDS_PATH=/home/username/webapps/sheep-service.com/cards
 MAP_PATH=/home/username/webapps/sheep-service.com/map

api/controllers/sheeps.controller.js

@@ -44,6 +44,24 @@ class SheepsController {
         }
     }
 
+    async getListStand(req, res) {
+       if (req.possibilities.can_view_stand) {
+            const result = await SheepsService.getListStand(req.mode);
+
+            if (result) {
+                return res.status(200).send(result);
+            } else {
+                return res
+                    .status(404)
+                    .send({ message: 'User not found.' });
+            }
+        } else {
+            return res
+                .status(404)
+                .send({ message: 'The sheep does not have enough rights.' });
+        }
+    }
+
     async createSheep(req, res) {
         const data = req.body;
 

api/middleware/metrics.js

@@ -0,0 +1,22 @@
+module.exports = (req, res, next) => {
+    const start = performance.now();
+
+    res.on("finish", () => {
+        const duration = performance.now() - start;
+
+        fetch("http://metrics:4005/push", {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+                type: "rest",
+                path: req.originalUrl,
+                method: req.method,
+                status: res.statusCode,
+                time: duration,
+                timestamp: Date.now()
+            })
+        }).catch(err => console.error(err));
+    });
+
+    next();
+};

api/routes/index.js

@@ -1,6 +1,8 @@
 const express = require('express');
 const router = express.Router();
 
+const metrics = require('../middleware/metrics');
+
 const authRoutes = require('./auth.routes');
 const sheepsRoutes = require('./sheeps.routes');
 const constructorRoutes = require('./constructor.routes');
@@ -18,6 +20,9 @@ const pushRoutes = require('./push.routes');
 const generatorCardsRoutes = require('./generator.cards.routes');
 const generatorReportTerritoriesRoutes = require('./generator.report.territories.routes');
 
+
+router.use(metrics);
+
 router.use('/auth', authRoutes);
 router.use('/sheeps?', sheepsRoutes);
 router.use('/constructor', constructorRoutes);

api/routes/sheeps.routes.js

@@ -15,4 +15,8 @@ router
     .route('/list')
     .get(authenticate, SheepsController.getList);
 
+router
+    .route('/list/stand')
+    .get(authenticate, SheepsController.getListStand);
+
 module.exports = router;

api/services/sheeps.service.js

@@ -75,6 +75,7 @@ class SheepService {
             });
         });
     }
+
     getList(mode) {
         return new Promise((res, rej) => {
             const sql = `
@@ -147,6 +148,82 @@ class SheepService {
             });
         });
     }
+
+    getListStand(mode) {
+        return new Promise((res, rej) => {
+            const sql = `
+                SELECT 
+                    sheeps.*,
+                    possibilities.can_add_sheeps,
+                    possibilities.can_view_sheeps,
+                    possibilities.can_add_territory,
+                    possibilities.can_view_territory,
+                    possibilities.can_manager_territory,
+                    possibilities.can_add_stand,
+                    possibilities.can_view_stand,
+                    possibilities.can_manager_stand,
+                    possibilities.can_add_schedule,
+                    possibilities.can_view_schedule
+                FROM 
+                    sheeps
+                LEFT JOIN 
+                    possibilities ON possibilities.sheep_id = sheeps.id
+                WHERE 
+                    possibilities.can_view_stand = '1'
+                ORDER BY 
+                    sheeps.group_id;
+            `;
+
+            db.all(sql, (err, rows) => {
+                if (err) {
+                    console.error(err.message);
+                    return res(false);
+                }
+
+                const fields = [
+                    "can_add_sheeps",
+                    "can_view_sheeps",
+                    "can_add_territory",
+                    "can_view_territory",
+                    "can_manager_territory",
+                    "can_add_stand",
+                    "can_view_stand",
+                    "can_manager_stand",
+                    "can_add_schedule",
+                    "can_view_schedule"
+                ];
+
+                const result = rows.map(sheep => {
+                    const data = {
+                        id: sheep.id,
+                        group_id: sheep.group_id,
+                        name: sheep.name,
+                        icon: sheep.icon,
+                        uuid: (mode && mode == 2) ? sheep.uuid : null,
+                        uuid_manager: (mode && mode == 2) ? sheep.uuid_manager : null,
+                        mode: mode ? Number(sheep.mode) : 0,
+                        mode_title: sheep.mode_title,
+                        possibilities: {}
+                    };
+
+                    fields.forEach(f => {
+                        data.possibilities[f] = false;
+                    });
+
+                    if (mode && (mode == 1 || mode == 2)) {
+                        fields.forEach(f => {
+                            data.possibilities[f] = !!sheep[f];
+                        });
+                    }
+
+                    return data;
+                });
+
+                res(result);
+            });
+        });
+    }
+
     createSheep(data) {
         const stmt1 = db.prepare('INSERT INTO sheeps(name, group_id, uuid) VALUES (?, ?, ?)');
         const stmt2 = db.prepare('INSERT INTO possibilities(can_view_territory, sheep_id) VALUES (?, ?)');
@@ -175,6 +252,7 @@ class SheepService {
             });
         });
     }
+
     updateSheep(data) {
         const stmt1 = db.prepare(`
             UPDATE 
@@ -241,6 +319,7 @@ class SheepService {
             });
         });
     }
+
     deleteSheep(data) {
         const stmtSelect = db.prepare('SELECT id FROM sheeps WHERE uuid = ?');
         const stmtDeletePoss = db.prepare('DELETE FROM possibilities WHERE sheep_id = ?');

dash.json

@@ -0,0 +1,163 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "datasource",
+          "uid": "prometheus"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "graphTooltip": 1,
+  "fiscalYearStartMonth": 0,
+  "id": null,
+  "links": [],
+  "panels": [
+
+
+    {
+      "datasource": { "type": "datasource", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisPlacement": "auto",
+            "drawStyle": "line",
+            "fillBorderColor": "rgba(255, 255, 255, 1)",
+            "gradientMode": "none",
+            "lineStyle": "solid",
+            "lineWidth": 1,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "unit": "ms"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 8, "x": 0, "y": 0 },
+      "id": 2,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "list", "placement": "bottom" },
+        "tooltip": { "mode": "single", "sort": "none" }
+      },
+      "targets": [
+        { "expr": "frontend_load_time", "legendFormat": "Завантаження: {{instance}}", "refId": "A" }
+      ],
+      "title": "Час завантаження Frontend (ms)",
+      "type": "timeseries"
+    },
+
+    {
+      "datasource": { "type": "datasource", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "unit": "short"
+        }
+      },
+      "gridPos": { "h": 8, "w": 8, "x": 8, "y": 0 },
+      "id": 4,
+      "options": {
+        "legend": {
+          "calcs": ["last"],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": { "mode": "single", "sort": "none" }
+      },
+      "targets": [
+        { "expr": "users_online", "legendFormat": "Онлайн користувачі", "refId": "A" }
+      ],
+      "title": "Онлайн користувачі (Gauge)",
+      "type": "timeseries"
+    },
+
+    {
+      "datasource": { "type": "datasource", "uid": "prometheus" },
+      "gridPos": { "h": 8, "w": 8, "x": 16, "y": 0 },
+      "id": 10,
+      "targets": [
+        {
+          "expr": "rest_request_duration_ms",
+          "legendFormat": "{{path}} ({{status}})",
+          "refId": "A"
+        }
+      ],
+      "title": "REST Запити (Duration)",
+      "type": "timeseries"
+    },
+
+    {
+      "datasource": { "type": "datasource", "uid": "prometheus" },
+      "gridPos": { "h": 8, "w": 8, "x": 0, "y": 8 },
+      "id": 6,
+      "targets": [
+        {
+          "expr": "rate(ws_in_bytes_total[5m])",
+          "legendFormat": "Вхідний WS-трафік (байт/сек)",
+          "refId": "A"
+        },
+        {
+          "expr": "rate(ws_out_bytes_total[5m])",
+          "legendFormat": "Вихідний WS-трафік (байт/сек)",
+          "refId": "B"
+        }
+      ],
+      "type": "timeseries",
+      "title": "WS трафік (Rate)"
+    },
+
+    {
+      "datasource": { "type": "datasource", "uid": "prometheus" },
+      "gridPos": { "h": 8, "w": 8, "x": 8, "y": 8 },
+      "id": 16,
+      "targets": [
+        { "expr": "frontend_resource_count", "legendFormat": "Кількість ресурсів", "refId": "A" }
+      ],
+      "title": "Кількість завантажених ресурсів",
+      "type": "timeseries"
+    },
+
+        {
+      "datasource": { "type": "datasource", "uid": "prometheus" },
+      "gridPos": { "h": 8, "w": 8, "x": 16, "y": 8 },
+      "id": 14,
+      "targets": [
+        {
+          "expr": "frontend_memory_used",
+          "legendFormat": "Використано JS Heap (MB)",
+          "refId": "A"
+        }
+      ],
+      "title": "Використання JS Heap (MB)",
+      "type": "timeseries"
+    }
+  ],
+
+  "refresh": "5s",
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": ["Sheep Service", "pushgateway"],
+
+  "time": { "from": "now-30m", "to": "now" },
+  "timezone": "browser",
+  "title": "Sheep Service Metrics",
+  "version": 1
+}