Skip to content

Commit

Permalink
nixos/glances: init (#303320)
Browse files Browse the repository at this point in the history
  • Loading branch information
drupol authored Nov 14, 2024
2 parents 3a2110a + d174bf4 commit cf69fc2
Show file tree
Hide file tree
Showing 8 changed files with 182 additions and 0 deletions.
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4134,6 +4134,12 @@
githubId = 43564;
name = "Claes Holmerson";
};
claha = {
email = "[email protected]";
github = "claha";
githubId = 9336788;
name = "Claes Hallström";
};
clebs = {
email = "[email protected]";
github = "clebs";
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2411.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@

- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](option.html#opt-services.zapret.enable).

- [Glances](https://github.com/nicolargo/glances), an open-source system cross-platform monitoring tool. Available as [services.glances](option.html#opt-services.glances).

## Backward Incompatibilities {#sec-release-24.11-incompatibilities}

- Nixpkgs now requires Nix 2.3.17 or newer to allow for zstd compressed binary artifacts.
Expand Down
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -888,6 +888,7 @@
./services/monitoring/do-agent.nix
./services/monitoring/fusion-inventory.nix
./services/monitoring/gatus.nix
./services/monitoring/glances.nix
./services/monitoring/goss.nix
./services/monitoring/grafana-agent.nix
./services/monitoring/grafana-image-renderer.nix
Expand Down
20 changes: 20 additions & 0 deletions nixos/modules/services/monitoring/glances.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Glances {#module-serives-glances}

Glances an Eye on your system. A top/htop alternative for GNU/Linux, BSD, Mac OS
and Windows operating systems.

Visit [the Glances project page](https://github.com/nicolargo/glances) to learn
more about it.

# Quickstart {#module-serives-glances-quickstart}

Use the following configuration to start a public instance of Glances locally:

```nix
{
services.glances = {
enable = true;
openFirewall = true;
};
};
```
110 changes: 110 additions & 0 deletions nixos/modules/services/monitoring/glances.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
{
pkgs,
config,
lib,
utils,
...
}:
let
cfg = config.services.glances;

inherit (lib)
getExe
maintainers
mkEnableOption
mkOption
mkIf
mkPackageOption
;

inherit (lib.types)
bool
listOf
port
str
;

inherit (utils)
escapeSystemdExecArgs
;

in
{
options.services.glances = {
enable = mkEnableOption "Glances";

package = mkPackageOption pkgs "glances" { };

port = mkOption {
description = "Port the server will isten on.";
type = port;
default = 61208;
};

openFirewall = mkOption {
description = "Open port in the firewall for glances.";
type = bool;
default = false;
};

extraArgs = mkOption {
type = listOf str;
default = [ "--webserver" ];
example = [
"--webserver"
"--disable-webui"
];
description = ''
Extra command-line arguments to pass to glances.
See https://glances.readthedocs.io/en/latest/cmds.html for all available options.
'';
};
};

config = mkIf cfg.enable {

environment.systemPackages = [ cfg.package ];

systemd.services."glances" = {
description = "Glances";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];

serviceConfig = {
Type = "simple";
DynamicUser = true;
ExecStart = "${getExe cfg.package} --port ${toString cfg.port} ${escapeSystemdExecArgs cfg.extraArgs}";
Restart = "on-failure";

NoNewPrivileges = true;
ProtectSystem = "full";
ProtectHome = true;
PrivateTmp = true;
PrivateDevices = true;
ProtectKernelTunables = true;
ProtectKernelModules = true;
ProtectKernelLogs = true;
ProtectControlGroups = true;
MemoryDenyWriteExecute = true;
RestrictAddressFamilies = [
"AF_INET"
"AF_INET6"
"AF_NETLINK"
"AF_UNIX"
];
LockPersonality = true;
RestrictRealtime = true;
ProtectClock = true;
ReadWritePaths = [ "/var/log" ];
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
SystemCallFilter = [ "@system-service" ];
};
};

networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
};

meta.maintainers = with maintainers; [ claha ];
}
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ in {
gitolite = handleTest ./gitolite.nix {};
gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {};
glance = runTest ./glance.nix;
glances = runTest ./glances.nix;
glusterfs = handleTest ./glusterfs.nix {};
gnome = handleTest ./gnome.nix {};
gnome-extensions = handleTest ./gnome-extensions.nix {};
Expand Down
36 changes: 36 additions & 0 deletions nixos/tests/glances.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ lib, ... }:

{
name = "glances";

nodes = {
machine_default =
{ pkgs, ... }:
{
services.glances = {
enable = true;
};
};

machine_custom_port =
{ pkgs, ... }:
{
services.glances = {
enable = true;
port = 5678;
};
};
};

testScript = ''
machine_default.start()
machine_default.wait_for_unit("glances.service")
machine_default.wait_for_open_port(61208)
machine_custom_port.start()
machine_custom_port.wait_for_unit("glances.service")
machine_custom_port.wait_for_open_port(5678)
'';

meta.maintainers = [ lib.maintainers.claha ];
}
6 changes: 6 additions & 0 deletions pkgs/applications/system/glances/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
packaging,
psutil,
setuptools,
pydantic,
nixosTests,
# Optional dependencies:
fastapi,
jinja2,
Expand Down Expand Up @@ -69,6 +71,10 @@ buildPythonApplication rec {
prometheus-client
] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp;

passthru.tests = {
service = nixosTests.glances;
};

meta = {
homepage = "https://nicolargo.github.io/glances/";
description = "Cross-platform curses-based monitoring tool";
Expand Down

0 comments on commit cf69fc2

Please sign in to comment.