samuel-p/universal-statuspage
Archived
1
0
Fork 0
Code Issues 3 Pull requests Releases Packages Wiki Activity

fixed jsonpath
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details

Browse source 
removed all grafana references
This commit is contained in:
Samuel Philipp 2020-07-05 22:09:28 +02:00
parent 8f5d83fd60
commit b442cb7f4f
10 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/app/app.component.spec.ts
View file

@ -20,16 +20,16 @@ describe('AppComponent', () => {
expect(app).toBeTruthy();
});
it(`should have as title 'grafana-statuspage'`, () => {
it(`should have as title 'universal-statuspage'`, () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.componentInstance;
expect(app.title).toEqual('grafana-statuspage');
expect(app.title).toEqual('universal-statuspage');
});
it('should render title', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.nativeElement;
expect(compiled.querySelector('.content span').textContent).toContain('grafana-statuspage app is running!');
expect(compiled.querySelector('.content span').textContent).toContain('universal-statuspage app is running!');
});
});

2
src/index.html
View file

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>grafana-statuspage</title>
<title>universal-statuspage</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link id="favicon" rel="icon" type="image/x-icon" href="">

9
src/main.status.ts
View file

@ -1,7 +1,8 @@
import {json, Router} from 'express';
import {CurrentStatus, State} from './app/_data/data';
import {existsSync, readFileSync, writeFileSync} from 'fs';
import * as jp from 'jsonpath';
import {join} from 'path';
import {JSONPath} from 'jsonpath-plus';
interface Cache {
[id: string]: State;
@ -43,7 +44,8 @@ interface StateKey {
const api = Router();
api.use(json());
const config = JSON.parse(readFileSync('config.json', {encoding: 'utf-8'})) as Config;
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
.map(g => g.services).reduce((x, y) => x.concat(y), [])
.reduce((services, service) => {
@ -56,7 +58,6 @@ const stateKeys: { [service: string]: StateKey } = config.groups
};
return services;
}, {});
const serviceStates = existsSync('cache.json') ? JSON.parse(readFileSync('cache.json', {encoding: 'utf-8'})) : {} as Cache;
let cache: CurrentStatus;
updateCache();
@ -68,7 +69,7 @@ api.post('/update/health', (req, res) => {
}
const serviceId = req.query.service as string;
const keys = stateKeys[serviceId];
const state = jp.value(req.body, keys.statePath);
const state = JSONPath({path: keys.statePath, json: req.body, wrap: false});
if (keys.stateValues.operational.includes(state)) {
serviceStates[serviceId] = 'operational';