Monito/monito
Monito
/
monito
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Monito:c4245fe199473e2393060855b7c1d512872e8311
Branches Tags
Monito:master
..
compare: Monito:07dc49fd13970e6b08075fd3d8ad59d82268f050
Branches Tags
Monito:master

No commits in common. "c4245fe199473e2393060855b7c1d512872e8311" and "07dc49fd13970e6b08075fd3d8ad59d82268f050" have entirely different histories.
c4245fe199 ... 07dc49fd13

5 changed files with 27 additions and 52 deletions
Show Stats Expand all files Collapse all files

5
extension.js
View File

@ -257,7 +257,7 @@ class Indicator extends PanelMenu.Button {
if ( ! col [ 'special' ] )
_child = new St.Label({ style_class: 'monito-label', text: text.toString(), });
else if ( col.special == 'actions' && this.serverLogic.canRecheck )
else if ( col.special == 'actions' )
{
_child = new St.BoxLayout ( { x_expand: true,
x_align: Clutter.ActorAlign.FILL,
@ -389,8 +389,7 @@ class Indicator extends PanelMenu.Button {
infoBox.add_child ( this.createBin ( entry.status, entry [ _col ], column_definitions [ _col ] ) );
}
if ( this.serverLogic.canRecheck )
infoBox.add_child ( this.createBin ( entry.status, entry, column_definitions [ 'actions' ] ) );
infoBox.add_child ( this.createBin ( entry.status, entry, column_definitions [ 'actions' ] ) );
_row ++;
}

26
servers/genericserver.js
View File

@ -29,8 +29,7 @@ const Me = ExtensionUtils.getCurrentExtension();
const Preferences = Me.imports.prefs;
class GenericServer {
class GenericServer {
constructor ( _server, _serverType = 'Generic' )
{
log ( '>>> New %s server #%s'.format ( _serverType, _server ) );
@ -39,8 +38,6 @@ class GenericServer {
this._settings = Preferences.getAccountSettings ( this._server );
this._httpSession = null;
this._url = null;
this.canRecheck = true;
}
getServer ( )
@ -108,27 +105,6 @@ class GenericServer {
}
}
handleCMDMessage ( _httpSession, message )
{
let _data;
try {
_data = this.handleMessage ( _httpSession, message );
if ( this.error )
log ( 'Parent error ' + this.error );
else
{
// if error, grep for class='errorMessage'
// else grep for class='successBox'
log ( 'Cmd output ' + _data );
}
}
catch ( e )
{
log ( e );
log ( _data );
}
}
getProcessedStatus ( )
{

21
servers/icinga.js
View File

@ -104,5 +104,26 @@ class Icinga extends GenericServer {
log ( _data );
}
}
handleCMDMessage ( _httpSession, message )
{
let _data;
try {
_data = super.handleMessage ( _httpSession, message );
if ( this.error )
log ( 'Parent error ' + this.error );
else
{
// if error, grep for class='errorMessage'
// else grep for class='successBox'
log ( 'Cmd output ' + _data );
}
}
catch ( e )
{
log ( e );
log ( _data );
}
}
}

2
servers/icinga2.js
View File

@ -33,8 +33,6 @@ const GenericServer = Me.imports.servers.genericserver.GenericServer;
class Icinga2 extends GenericServer {
constructor ( _server ) {
super(_server, 'Icinga2');
this.canRecheck = false;
}
refresh ( extension ) {

25
servers/icinga2api.js
View File

@ -31,7 +31,6 @@ const GenericServer = Me.imports.servers.genericserver.GenericServer;
class Icinga2API extends GenericServer {
constructor ( _server ) {
super(_server, 'Icinga2 API');
}
@ -47,31 +46,13 @@ class Icinga2API extends GenericServer {
{
super.prepareHttp ( );
let message = Soup.form_request_new_from_hash ( 'GET', this.urlcgi + '/objects/services', { } );
let message = Soup.form_request_new_from_hash ( 'GET', this.urlcgi, { 'format': 'json' } );
message.request_headers.append ( 'Accept', 'application/json' );
this.authenticateAndSend ( message, this.handlePollMessage );
this.authenticateAndSend ( message );
}
recheck ( entry )
{
let message = Soup.form_request_new_from_hash ( 'POST', this.urlcgi + '/actions/reschedule-check', { } );
let params = '{ "type": "Service", "filter": "host.name==\\"%s\\" && service.name==\\"%s\\"", "force": true, "pretty": true }' . format ( encodeURI ( entry.host_name ), encodeURI ( entry.service_display_name ) );
message.request_body.truncate();
message.request_body.append ( params );
message.request_body.flatten();
log ( '> Body: ' + message.request_body.data );
message.request_headers.append ( 'Accept', 'application/json' );
log ( message.request_headers );
this.authenticateAndSend ( message, this.handleCMDMessage );
}
handlePollMessage ( _httpSession, message )
handleMessage ( _httpSession, message )
{
let _data = super.handleMessage ( _httpSession, message );
try