develop #19

Manually merged
samuel-p merged 9 commits from develop into master 2020-07-16 20:36:42 +00:00
8 changed files with 52 additions and 50 deletions

View File

@ -1,4 +1,4 @@
FROM node:alpine
FROM node:14.5.0-alpine
COPY dist/universal-statuspage /universal-statuspage

View File

@ -2,25 +2,23 @@
"authToken": "test",
"title": "sp-status",
"description": "Services hosted by sp-codes",
"servicesPath": "$.alerts.*",
"idPath": "$.labels.status_service",
"statePath": "$.status",
"stateValues": {
"operational": ["OK"],
"maintenance": ["PAUSED"]
"operational": ["ok", "resolved"],
"maintenance": ["paused"]
},
"groups": [
{
"id": "test",
"name": "Test",
"url": "http://sp-codes.de",
"services": [
{
"id": "test",
"name": "test",
"url": "http://sp-codes.de",
"statePath": "$.state",
"stateValues": {
"operational": ["ok"],
"maintenance": ["paused"]
}
"statePath": "$.state"
}
]
}

View File

@ -26,10 +26,10 @@
"@angular/platform-browser-dynamic": "~10.0.2",
"@angular/platform-server": "~10.0.2",
"@angular/router": "~10.0.2",
"@fortawesome/fontawesome-free": "^5.13.1",
"@fortawesome/fontawesome-free": "^5.14.0",
"@nguniversal/express-engine": "^10.0.1",
"bootstrap": "^4.5.0",
"express": "^4.15.2",
"express": "^4.17.1",
"jsonpath-plus": "^4.0.0",
"roboto-fontface": "^0.10.0",
"rxjs": "~6.6.0",
@ -42,7 +42,7 @@
"@angular/compiler-cli": "~10.0.2",
"@angular/language-service": "~10.0.2",
"@nguniversal/builders": "^10.0.1",
"@types/express": "^4.17.0",
"@types/express": "^4.17.7",
"@types/node": "^14.0.14",
"@types/jasmine": "~3.5.11",
"@types/jasminewd2": "~2.0.3",

View File

@ -25,7 +25,7 @@
"zone.js"
],
"packagePatterns": [
"^angular",
"^@angular",
"^karma",
"^jasmine"
],

View File

@ -8,6 +8,7 @@ export interface CurrentStatus {
export interface Group {
id: string;
name: string;
url?: string;
state: State;
services: Service[];
}
@ -15,7 +16,7 @@ export interface Group {
export interface Service {
id: string;
name: string;
url: string;
url?: string;
state: State;
}

View File

@ -1,14 +1,15 @@
<mat-accordion [multi]="true">
<mat-expansion-panel *ngFor="let group of groups" [expanded]="true">
<mat-expansion-panel-header>
<mat-panel-title><i [class]="stateClasses[group.state]"></i> {{group.name}}</mat-panel-title>
<!-- <mat-panel-description>-->
<!-- <span class="text-capitalize">{{getGroupState(group.services)}}</span>-->
<!-- </mat-panel-description>-->
<mat-panel-title>
<i [class]="stateClasses[group.state]"></i>
<a *ngIf="group.url" class="name" [href]="group.url" target="_blank" (click)="$event.stopPropagation()">{{group.name}}</a>
<span *ngIf="!group.url">{{group.name}}</span>
</mat-panel-title>
</mat-expansion-panel-header>
<mat-list>
<a *ngFor="let service of group.services; last as last" mat-list-item [href]="service.url" target="_blank">
<a *ngFor="let service of group.services; last as last" mat-list-item [href]="service.url || group.url || '#'" target="_blank">
<div matLine class="d-flex">
<i [class]="stateClasses[service.state]"></i>
<span class="text-truncate">{{service.name}}</span>

View File

@ -13,6 +13,11 @@
a {
text-decoration: none;
outline: none;
color: #ffffff;
&:hover.name, &:hover .name {
text-decoration: underline;
}
}
mat-panel-title {

View File

@ -12,7 +12,9 @@ interface Config {
authToken: string;
title: string;
description: string;
statePath: string;
servicesPath?: string;
idPath?: string;
statePath?: string;
stateValues: {
operational: string[];
maintenance: string[];
@ -20,42 +22,26 @@ interface Config {
groups: {
id: string;
name: string;
url?: string;
services: {
id: string;
name: string;
url: string;
url?: string;
statePath?: string;
stateValues?: {
operational?: string[];
maintenance?: string[];
};
}[];
}[];
}
interface StateKey {
statePath: string;
stateValues: {
operational: string[];
maintenance: string[];
};
}
const api = Router();
api.use(json());
const serviceStates = existsSync(join(process.cwd(), 'cache.json')) ? JSON.parse(readFileSync(join(process.cwd(), 'cache.json'), {encoding: 'utf-8'})) : {} as Cache;
const config = JSON.parse(readFileSync(join(process.cwd(), 'config.json'), {encoding: 'utf-8'})) as Config;
const stateKeys: { [service: string]: StateKey } = config.groups
const serviceStatePaths: { [service: string]: string } = config.groups
.map(g => g.services).reduce((x, y) => x.concat(y), [])
.filter(s => s.statePath)
.reduce((services, service) => {
services[service.id] = {
statePath: service.statePath || config.statePath,
stateValues: {
operational: service.stateValues ? service.stateValues.operational || config.stateValues.operational : config.stateValues.operational,
maintenance: service.stateValues ? service.stateValues.maintenance || config.stateValues.maintenance : config.stateValues.maintenance,
}
};
services[service.id] = service.statePath;
return services;
}, {});
@ -68,17 +54,27 @@ api.post('/update/health', (req, res) => {
return res.status(401).send('invalid token');
}
const serviceId = req.query.service as string;
const keys = stateKeys[serviceId];
const state = JSONPath({path: keys.statePath, json: req.body, wrap: false});
if (keys.stateValues.operational.includes(state)) {
serviceStates[serviceId] = 'operational';
} else if (keys.stateValues.maintenance.includes(state)) {
serviceStates[serviceId] = 'maintenance';
} else {
serviceStates[serviceId] = 'outage';
let services: { id: string, state: string }[] = [];
if (serviceId) {
services = [{id: serviceId, state: JSONPath({path: serviceStatePaths[serviceId], json: req.body, wrap: false})}];
} else if (config.servicesPath && config.idPath && config.statePath) {
services = JSONPath({path: config.servicesPath, json: req.body})
.map(s => ({
id: JSONPath({path: config.idPath, json: s, wrap: false}),
state: JSONPath({path: config.statePath, json: s, wrap: false})
}));
}
services.forEach(s => {
if (config.stateValues.operational.includes(s.state)) {
serviceStates[s.id] = 'operational';
} else if (config.stateValues.maintenance.includes(s.state)) {
serviceStates[s.id] = 'maintenance';
} else {
serviceStates[s.id] = 'outage';
}
});
updateCache();
writeFileSync('cache.json', JSON.stringify(serviceStates), {encoding: 'utf-8'});
@ -110,6 +106,7 @@ function updateCache(): void {
return {
id: group.id,
name: group.name,
url: group.url,
state: calculateOverallState(services.map(s => s.state)),
services: services
};