YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove the whole monitoring / glances stuff

Browse source
This commit is contained in:
Alexandre Aubin 2019-10-14 05:11:22 +02:00
parent 35099d0dbc
commit 713a9529d6
4 changed files with 0 additions and 374 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/js/yunohost/controllers/monitor.js
View file

@ -1,50 +0,0 @@
(function() {
// Get application context
var app = Sammy.apps['#main'];
var store = app.store;
/**
* Monitor
*
*/
// Server monitoring
app.get('#/tools/monitor', function (c) {
var monitorData = {};
// Why this method ?
c.api('/services/glances', function(data) { // ?
monitorData.status = true;
if (data.status == 'running') {
c.api('/monitor/system', function(data) {
monitorData.system = data;
c.api('/monitor/disk', function(data) {
monitorData.disk = data;
c.api('/monitor/network', function(data) {
monitorData.network = data;
// Remove useless interface
delete monitorData.network.usage.lo;
// Get YunoHost versions too
c.api('/diagnosis', function(diagnosis) {
monitorData.versions = diagnosis.packages;
c.view('tools/tools_monitoring', monitorData);
});
});
});
});
}
else {
monitorData.status = false;
c.view('tools/tools_monitoring', monitorData);
}
}, 'GET');
});
})();

37
src/locales/en.json
View file

@ -46,7 +46,6 @@
"application": "Application",
"applications": "Applications",
"archive_empty": "Empty archive",
"available": "Available",
"available_apps": "Available apps",
"backup": "Backup",
"backup_action": "Backup",
@ -62,12 +61,9 @@
"backup_type": "Type",
"backups_no": "No backup",
"begin": "Begin",
"bit_rate": "Bit rate",
"both": "Both",
"cancel": "Cancel",
"check": "Check",
"check_mx": "MX record",
"check_stmp": "port 25 access",
"close": "Close",
"confirm_access_add": "Are you sure you want to add access to %s for all users?",
"confirm_access_clear": "Are you sure you want to clear all access to %s?",
@ -100,10 +96,7 @@
"confirm_reboot_action_shutdown": "Are you sure you want to shutdown your server?",
"connection": "Connection",
"copy": "Copy",
"count_min": "%s min",
"cpu_load": "CPU Load",
"created_at": "Created at",
"cumulative_usage": "Cumulative usage",
"current_maintainer_title": "Current maintainer of this package",
"custom_app_install": "Install custom app",
"custom_app_url_only_github": "Currently only from GitHub",
@ -117,7 +110,6 @@
"diagnosis_with_private": "Diagnosis with private data",
"disable": "Disable",
"disabled": "Disabled",
"disk": "Disk",
"dns": "DNS",
"domain": "Domain",
"domain_add": "Add domain",
@ -148,14 +140,11 @@
"error_connection_interrupted": "The server closed the connection instead of answering it. Has nginx or the yunohost-api been restarted or stoppted for some reason? (Error code/message: %s)",
"everyone_has_access": "Everyone has access.",
"experimental_warning": "Warning: this feature is experimental and not consider stable, you shouldn't be using it except if you know what you are doing.",
"filesystem": "Filesystem",
"firewall": "Firewall",
"footer_version": "Powered by <a href='https://yunohost.org'>YunoHost</a> %s (%s).",
"form_input_example": "Example: %s",
"free": "Free",
"from_to": "from %s to %s",
"fs_type": "FS Type",
"gateway": "Gateway: ",
"good_practices_about_admin_password": "You are now about to define a new admin password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).",
"good_practices_about_user_password": "You are now about to define a new user password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).",
"home": "Home",
@ -174,7 +163,6 @@
"hook_data_home_desc": "User data located in /home/USER",
"hook_data_mail": "Mail",
"hook_data_mail_desc": "Raw emails stored on the server",
"hostname": "Hostname",
"id": "ID",
"inactive": "Inactive",
"infos": "Info",
@ -185,9 +173,7 @@
"installed": "Installed",
"installed_apps": "Installed apps",
"installing": "Installing",
"interface": "Interface",
"internal_exception": "<strong>Yunohost encountered an internal error:/</strong><br><em>Really sorry about that.<br>You should look for help on <a href=\"https://forum.yunohost.org/\">the forum</a> or <a href=\"https://chat.yunohost.org/\">the chat</a> to fix the situation, or report the bug on <a href=\"https://github.com/YunoHost/issues\">the bugtracker</a>.</em><br>The following information might be useful for the person helping you:<h3>Action</h3><pre>%s%s</pre><h3>Traceback</h3><pre>%s</pre>",
"io": "I/O",
"ipv4": "IPv4",
"ipv6": "IPv6",
"label": "Label",
@ -196,7 +182,6 @@
"license": "License",
"loading": "Loading …",
"local_archives": "Local archives",
"local_ip": "Local IP",
"log": "Log",
"logged_in": "Logged in",
"logged_out": "Logged out",
@ -209,7 +194,6 @@
"manage_apps": "Manage apps",
"manage_domains": "Manage domains",
"manage_users": "Manage users",
"memory": "Memory",
"menu": "Menu",
"migrations": "Migrations",
"migrations_pending": "Pending migrations",
@ -217,14 +201,9 @@
"migrations_no_pending": "No pending migrations",
"migrations_no_done": "No previous migrations",
"mode": "Mode",
"monitoring": "Monitoring",
"monitoring_check_glances": "Check <a href='#/services/glances'>glances</a> service status.",
"monitoring_disabled": "Monitoring is not enabled.",
"mount_point": "Mount point",
"multi_instance": "Multi instance",
"myserver": "myserver",
"myserver_org": "myserver.org",
"network": "Network",
"next": "Next",
"no": "No",
"no_allowed_users": "No allowed users.",
@ -240,7 +219,6 @@
"operations": "Operations",
"orphaned": "not maintained",
"orphaned_details": "This app is not maintained anymore. It may still be working but won't receive any upgrade. Feel free to come and revive it!",
"os": "OS",
"password": "Password",
"password_confirmation": "Password confirmation",
"password_description": "Password must be at least %s characters long.",
@ -280,13 +258,8 @@
"postinstall_intro_3": "You can obtain more information by visiting the <a href='//yunohost.org/postinstall' target='_blank'>appropriate documentation page</a>",
"postinstall_password": "This password will be used to manage everything on your server. Take the time to choose it wisely.",
"previous": "Previous",
"process": "Process",
"protocol": "Protocol",
"public_ip": "Public IP: ",
"ram": "RAM",
"read": "Read",
"read_more": "Read more",
"reception": "Reception",
"refresh_app_list": "Refresh list",
"remove_access": "Remove access",
"request_adoption": "waiting adoption",
@ -295,7 +268,6 @@
"request_help_details": "The current maintainer would like some help with the maintainance of this app. Feel free to come contribute on it!",
"restore": "Restore",
"run": "Run",
"running": "Running",
"save": "Save",
"search_for_apps": "Search for apps...",
"select_user": "Select user",
@ -317,7 +289,6 @@
"storage_create": "Add remote storage",
"storages_new": "New remote storage",
"storages_no": "No storages.",
"swap": "Swap",
"system": "System",
"system_apps": "Apps",
"system_apps_nothing": "There are no apps to upgrade.",
@ -329,7 +300,6 @@
"system_upgrade_all_applications_btn": "Upgrade all applications",
"system_upgrade_all_packages_btn": "Upgrade all packages",
"tcp": "TCP",
"time_since_update": "Time since update: ",
"tools": "Tools",
"tools_adminpw": "Change administration password",
"tools_adminpw_confirm_placeholder": "Confirm the new password",
@ -351,8 +321,6 @@
"tools_shutdown_done": "Shutting down...",
"tools_shuttingdown": "Your server is powering off. As long as your server is off, you won't be able to use the web administration.",
"tools_shutdown_reboot": "Shutdown/Reboot",
"total": "Total",
"transmission": "Transmission",
"udp": "UDP",
"unauthorized": "Unauthorized",
"uninstall": "Uninstall",
@ -364,10 +332,7 @@
"upnp": "UPnP",
"upnp_disabled": "UPnP is disabled.",
"upnp_enabled": "UPnP is enabled.",
"uptime": "Uptime",
"url": "URL",
"usage": "Usage",
"used": "Used",
"user_email": "Email",
"user_emailaliases": "Mail aliases",
"user_emailforward": "Mail forward",
@ -383,11 +348,9 @@
"users_list": "User list",
"users_new": "New user",
"users_no": "No users.",
"versions": "Versions",
"version": "Version",
"view_user_profile": "View %s's profile",
"warning_first_user": "You probably need to <a href='#/users/create' class='alert-link'>create a user</a> first.",
"write": "Write",
"wrong_password": "Wrong password",
"yes": "Yes",
"certificate_alert_not_valid": "CRITICAL: Current certificate is not valid! HTTPS won't work at all!",

4
src/views/tools/tools_list.ms
View file

@ -34,10 +34,6 @@
<h2 style="font-weight:600; padding-left:0.5em;">{{t 'advanced'}}</h2>
<div class="list-group">
<a href="#/tools/monitor" class="list-group-item slide clearfix">
<span class="pull-right fa-chevron-right"></span>
<h2 class="list-group-item-heading">{{t 'monitoring'}}</h2>
</a>
<a href="#/tools/firewall" class="list-group-item slide clearfix">
<span class="pull-right fa-chevron-right"></span>
<h2 class="list-group-item-heading">{{t 'firewall'}}</h2>

283
src/views/tools/tools_monitoring.ms
View file

@ -1,283 +0,0 @@
<div class="btn-breadcrumb">
<a href="#/" ><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a>
<a href="#/tools">{{t 'tools'}}</a>
<a href="#/tools/monitor">{{t 'monitoring'}}</a>
</div>
<div class="separator"></div>
{{#if status}}
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title"><span class="fa-fw fa-info-circle"></span> {{t 'infos'}}</h2>
</div>
<div class="panel-body">
<dl class="dl-horizontal">
<dt>{{t 'hostname'}}</dt>
<dd>{{system.infos.hostname}}</dd>
<dt>{{t 'os'}}</dt>
<dd>{{ucwords system.infos.linux_distro}} {{system.infos.platform}} ({{system.infos.os_name}} {{system.infos.os_version}})</dd>
<dt>{{t 'uptime'}}</dt>
<dd>{{system.uptime}}</dd>
</dl>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title"><span class="fa-fw fa-cogs"></span> {{t 'versions'}}</h2>
</div>
<div class="panel-body">
<dl class="dl-horizontal">
{{#each versions}}
<dt>{{@key}}</dt>
<dd>{{version}} ({{repo}})</dd>
{{/each}}
</dl>
</div>
</div>
<div class="panel-group" id="accordion">
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">
<span class="fa-fw fa-check-square-o"></span>
<a data-toggle="collapse" data-parent="#accordion" href="#check">{{t 'check'}}</a>
</h2>
</div>
<div id="check" class="panel-collapse collapse">
<div class="panel-body">
<dl class="dl-horizontal">
<dt>{{t 'check_stmp'}}</dt>
<dd>{{network.check.smtp_check}}</dd>
<dt>{{t 'check_mx'}}</dt>
<dd>
{{#if network.check.mx_check.mx0}}
<ul>
{{#each network.check.mx_check}}
<li>{{this}}</li>
{{/each}}
</ul>
{{else}}
{{network.check.mx_check}}
{{/if}}
</dd>
</dl>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">
<span class="fa-fw fa-cog"></span>
<a data-toggle="collapse" data-parent="#accordion" href="#system">{{t 'system'}}</a>
</h2>
</div>
<div id="system" class="panel-collapse collapse">
<div class="panel-body row">
<div class="col-md-4">
<h3>{{t 'memory'}}</h3>
<h4>{{t 'ram'}}</h4>
<table class="table table-condensed">
<tr>
<td>{{t 'used'}}</td>
<td>{{humanSize system.memory.ram.used}} ({{system.memory.ram.percent}} %)</td>
</tr>
<tr>
<td>{{t 'free'}}</td>
<td>{{humanSize system.memory.ram.free}}</td>
</tr>
<tr class="active">
<td>{{t 'total'}}</td>
<td>{{humanSize system.memory.ram.total}}</td>
</tr>
</table>
<h4>{{t 'swap'}}</h4>
<table class="table table-condensed">
<tr>
<td>{{t 'used'}}</td>
<td>{{humanSize system.memory.swap.used}} ({{system.memory.swap.percent}} %)</td>
</tr>
<tr>
<td>{{t 'free'}}</td>
<td>{{humanSize system.memory.swap.free}}</td>
</tr>
<tr class="active">
<td>{{t 'total'}}</td>
<td>{{humanSize system.memory.swap.total}}</td>
</tr>
</table>
</div>
<div class="col-md-4">
<h3>{{t 'cpu_load'}}</h3>
<table class="table table-condensed">
<tr>
<td>{{t 'count_min' "1"}}</td>
<td>{{system.cpu.load.min1}}</td>
</tr>
<tr>
<td>{{t 'count_min' "5"}}</td>
<td>{{system.cpu.load.min5}}</td>
</tr>
<tr>
<td>{{t 'count_min' "15"}}</td>
<td>{{system.cpu.load.min15}}</td>
</tr>
</table>
</div>
<div class="col-md-4">
<h3>{{t 'process'}}</h3>
<table class="table table-condensed">
<tr>
<td>{{t 'running'}}</td>
<td>{{system.process.running}}</td>
</tr>
<tr>
<td>{{t 'sleeping'}}</td>
<td>{{system.process.sleeping}}</td>
</tr>
<tr class="active">
<td>{{t 'total'}}</td>
<td>{{system.process.total}}</td>
</tr>
</table>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">
<span class="fa-fw fa-cloud"></span>
<a data-toggle="collapse" data-parent="#accordion" href="#network">{{t 'network'}}</a>
</h2>
</div>
<div id="network" class="panel-collapse collapse">
<div class="panel-body">
<b>{{t 'public_ip'}}</b>{{network.infos.public_ip}}
<br>
<b>{{t 'gateway'}}</b>{{network.infos.gateway}}
<h3>{{t 'local_ip'}}</h3>
<table class="table table-condensed">
<thead>
<tr>
<th>{{t 'interface'}}</th>
<th>{{t 'ipv4'}}</th>
<th>{{t 'ipv6'}}</th>
</tr>
</thead>
<tbody>
{{#each network.infos.local_ip}}
<tr>
<td>{{@key}}</td>
<td>{{ ipv4 }}</td>
<td>{{ ipv6 }}</td>
</tr>
{{/each}}
</tbody>
</table>
<h3>{{t 'usage'}}</h3>
{{#each network.usage}}
<div class="clearfix">
<table class="table table-condensed">
<thead>
<tr>
<th>
<h4>
{{@key}}
<small>{{t 'time_since_update'}}{{humanTime time_since_update}}</small>
</h4>
</th>
<th>{{t 'bit_rate'}}</th>
<th>{{t 'cumulative_usage'}}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{{t 'transmission'}}</td>
<td>{{bitRate tx time_since_update}}</td>
<td>{{humanSize cumulative_tx}}</td>
</tr>
<tr>
<td>{{t 'reception'}}</td>
<td>{{bitRate rx time_since_update}}</td>
<td>{{humanSize cumulative_rx}}</td>
</tr>
</tbody>
</table>
</div>
{{/each}}
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">
<span class="fa-fw fa-hdd-o"></span>
<a data-toggle="collapse" data-parent="#accordion" href="#disk">{{t 'disk'}}</a>
</h2>
</div>
<div id="disk" class="panel-collapse collapse">
<div class="panel-body">
{{#each disk}}
<div class="clearfix">
<h3>{{@key}}</h3>
<div class="row">
<div class="col-md-6">
<h4>{{t 'filesystem'}}</h4>
<table class="table table-condensed">
<tr>
<td>{{t 'fs_type'}}</td><td>{{ filesystem.fs_type }}</td>
</tr>
<tr>
<td>{{t 'mount_point'}}</td><td>{{ filesystem.mnt_point }}</td>
</tr>
<tr>
<td>{{t 'size'}}</td><td>{{humanSize filesystem.size }}</td>
</tr>
<tr>
<td>{{t 'used'}}</td><td>{{humanSize filesystem.used }}</td>
</tr>
<tr class="active">
<td>{{t 'available'}}</td><td>{{humanSize filesystem.avail }}</td>
</tr>
</table>
</div>
<div class="col-md-6">
<h4>{{t 'io'}} <small>{{t 'time_since_update'}}{{humanTime io.time_since_update }}</small></h4>
<table class="table table-condensed">
<tr>
<td>{{t 'read'}}</td><td>{{humanSize io.read_bytes }}</td>
</tr>
<tr>
<td>{{t 'write'}}</td><td>{{humanSize io.write_bytes }}</td>
</tr>
</table>
</div>
</div>
{{/each}}
</div>
</div>
</div>
</div><!-- .panel-group -->
{{else}}
<div class="alert alert-warning">
<span class="fa-exclamation-triangle"></span>
{{t 'monitoring_disabled'}}
<br>
{{t 'monitoring_check_glances'}}
</div>
{{/if}}