Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
FFS Gluon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
firmware
FFS Gluon
Commits
a8beae51
Commit
a8beae51
authored
Nov 27, 2019
by
Martin Weinelt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'lemoer/pr_status_page_gateway_nexthop'
parents
06476c24
55eff45f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
1 deletion
+24
-1
package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html
...us-page/files/lib/gluon/status-page/view/status-page.html
+1
-1
package/gluon-status-page/i18n/de.po
package/gluon-status-page/i18n/de.po
+3
-0
package/gluon-status-page/i18n/gluon-status-page.pot
package/gluon-status-page/i18n/gluon-status-page.pot
+3
-0
package/gluon-status-page/javascript/status-page.js
package/gluon-status-page/javascript/status-page.js
+17
-0
No files found.
package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html
View file @
a8beae51
...
...
@@ -135,7 +135,7 @@
<tr><th><
%
:Load
average
%
></th><td><
%=
statistics
('
loadavg
',
'
decimal
')
%
></td></tr>
<tr><th><
%
:RAM
%
></th><td><
%=
statistics
('
memory
',
'
memory
')
%
></td></tr>
<tr><th><
%
:Filesystem
%
></th><td><
%=
statistics
('
rootfs_usage
',
'
percent
')
%
></td></tr>
<tr><th><
%
:Gateway
%
></th><td><
%=
statistics
('
gateway
')
%
></td></tr>
<tr><th><
%
:Gateway
%
></th><td><
%=
statistics
('
gateway
')
%
><
br
/><
%=
statistics
('
gateway_nexthop
',
'
neighbour
')
%
><
/td></tr>
<tr><th><
%
:Clients
%
></th><td><
%=
statistics
('
clients
/
total
')
%
></td></tr>
</table>
...
...
package/gluon-status-page/i18n/de.po
View file @
a8beae51
...
...
@@ -55,6 +55,9 @@ msgstr "Weitergeleitet"
msgid "Gateway"
msgstr "Gateway"
msgid "Gateway Nexthop"
msgstr "Gateway Nexthop"
msgid "IP address"
msgstr "IP-Adresse"
...
...
package/gluon-status-page/i18n/gluon-status-page.pot
View file @
a8beae51
...
...
@@ -46,6 +46,9 @@ msgstr ""
msgid "Gateway"
msgstr ""
msgid "Gateway Nexthop"
msgstr ""
msgid "IP address"
msgstr ""
...
...
package/gluon-status-page/javascript/status-page.js
View file @
a8beae51
...
...
@@ -112,6 +112,20 @@
'
bytes
'
:
function
(
bytes
)
{
return
prettyBytes
(
bytes
);
},
'
neighbour
'
:
function
(
addr
)
{
if
(
!
addr
)
return
''
;
for
(
var
i
in
interfaces
)
{
var
iface
=
interfaces
[
i
];
var
neigh
=
iface
.
get_neigh
(
addr
);
if
(
!
neigh
)
continue
;
return
'
via
'
+
neigh
.
get_hostname
()
+
'
(
'
+
i
+
'
)
'
;
}
return
'
via
'
+
addr
+
'
(unknown iface)
'
;
}
}
...
...
@@ -582,6 +596,9 @@
}
return
{
'
get_hostname
'
:
function
()
{
return
hostname
.
textContent
;
},
'
update_nodeinfo
'
:
function
(
nodeinfo
)
{
var
addr
=
choose_address
(
nodeinfo
.
network
.
addresses
);
if
(
addr
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment