From b779d216321db88bd16803914081e2b7a5714f7c Mon Sep 17 00:00:00 2001 From: Dudu Lasry Date: Mon, 29 Jul 2024 13:40:57 +0300 Subject: [PATCH 1/3] Add Merlinn to README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c3e4c22..2ab8a21 100644 --- a/README.md +++ b/README.md @@ -477,6 +477,7 @@ Monitoring software. _Related: [Metrics & Metric Collection](#metrics--metric-collection)_ +- [Merlinn](https://merlinn.co/) - AI Slackbot that helps troubleshooting production incidents by connecting to multiple o11y tools, collaboration systems and more. ([Source Code](https://github.com/merlinn-co/merlinn)) `Apache-2.0` `Docker/Node.js` - [Adagios](http://adagios.org/) - Web based Nagios interface for configuration and monitoring (replacement to the standard interface), and a REST interface. ([Source Code](https://github.com/opinkerfi/adagios)) `AGPL-3.0` `Docker/Python` - [Alerta](https://alerta.io/) - Distributed, scalable and flexible monitoring system. ([Source Code](https://github.com/alerta/alerta)) `Apache-2.0` `Python` - [Bloonix](https://bloonix-monitoring.org/) - Bloonix is a monitoring solution that helps businesses to ensure high availability and performance. ([Source Code](https://github.com/bloonix)) `GPL-3.0` `Perl` From 99775bb2268b893ff4638adcf0400c8f4ea5f55c Mon Sep 17 00:00:00 2001 From: Dudu Lasry Date: Mon, 29 Jul 2024 13:45:58 +0300 Subject: [PATCH 2/3] Change the order so it'd be sorted alphabetically --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ab8a21..cbe91d9 100644 --- a/README.md +++ b/README.md @@ -477,7 +477,6 @@ Monitoring software. _Related: [Metrics & Metric Collection](#metrics--metric-collection)_ -- [Merlinn](https://merlinn.co/) - AI Slackbot that helps troubleshooting production incidents by connecting to multiple o11y tools, collaboration systems and more. ([Source Code](https://github.com/merlinn-co/merlinn)) `Apache-2.0` `Docker/Node.js` - [Adagios](http://adagios.org/) - Web based Nagios interface for configuration and monitoring (replacement to the standard interface), and a REST interface. ([Source Code](https://github.com/opinkerfi/adagios)) `AGPL-3.0` `Docker/Python` - [Alerta](https://alerta.io/) - Distributed, scalable and flexible monitoring system. ([Source Code](https://github.com/alerta/alerta)) `Apache-2.0` `Python` - [Bloonix](https://bloonix-monitoring.org/) - Bloonix is a monitoring solution that helps businesses to ensure high availability and performance. ([Source Code](https://github.com/bloonix)) `GPL-3.0` `Perl` @@ -493,6 +492,7 @@ _Related: [Metrics & Metric Collection](#metrics--metric-collection)_ - [Icinga](https://www.icinga.com/) - Nagios fork that has since lapped nagios several times. Comes with the possibility of clustered monitoring. ([Source Code](https://github.com/Icinga/icinga2)) `GPL-2.0` `C++` - [LibreNMS](https://www.librenms.org) - Fully featured network monitoring system that provides a wealth of features and device support. ([Source Code](https://github.com/librenms/librenms)) `GPL-3.0` `PHP` - [Linux Dash](https://github.com/afaqurk/linux-dash) - A low-overhead monitoring web dashboard for a GNU/Linux machine. `MIT` `Nodejs/Go/Python/PHP` +- [Merlinn](https://merlinn.co/) - AI Slackbot that helps troubleshooting production incidents by connecting to multiple o11y tools, collaboration systems and more. ([Source Code](https://github.com/merlinn-co/merlinn)) `Apache-2.0` `Docker/Node.js` - [Monit](https://mmonit.com/monit/#home) - Small utility for managing and monitoring Unix systems. ([Source Code](https://bitbucket.org/tildeslash/monit/src/master/)) `AGPL-3.0` `C` - [Munin](https://munin-monitoring.org/) - Networked resource monitoring tool. ([Source Code](https://github.com/munin-monitoring/munin)) `GPL-2.0` `Perl/Shell` - [Naemon](https://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features. ([Source Code](https://github.com/naemon/naemon-core)) `GPL-2.0` `C` From 21df731c92281334bf21164cb64c2e8f6ade7de6 Mon Sep 17 00:00:00 2001 From: basings <92867705+basings@users.noreply.github.com> Date: Sun, 18 Aug 2024 15:06:45 +0200 Subject: [PATCH 3/3] add Gluetun (#557) Co-authored-by: nodiscc --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 66fa38c..a77431c 100644 --- a/README.md +++ b/README.md @@ -702,6 +702,7 @@ VPN software. - [DefGuard](https://defguard.net/) - True enterprise WireGuard with MFA/2FA and SSO. ([Source Code](https://github.com/DefGuard)) `Apache-2.0` `Rust` - [Dockovpn](https://dockovpn.io) - Out-of-the-box stateless dockerized OpenVPN server which starts in less than 2 seconds. ([Source Code](https://github.com/dockovpn/dockovpn)) `GPL-2.0` `Docker` - [Firezone](https://www.firezone.dev/) - WireGuard based VPN Server and Firewall. ([Source Code](https://github.com/firezone/firezone)) `Apache-2.0` `Docker` +- [Gluetun VPN client](https://github.com/qdm12/gluetun) - VPN client in a thin Docker container for multiple VPN providers, written in Go, and using OpenVPN or Wireguard, DNS over TLS, with a few proxy servers built-in. `MIT` `docker` - [Headscale](https://github.com/juanfont/headscale) - Self-hostable fork of [Tailscale](https://tailscale.com), cross-platform clients, simple to use, built-in (currently experimental) monitoring tools. `BSD-3-Clause` `Go` - [Nebula](https://github.com/slackhq/nebula) - A scalable p2p VPN with a focus on performance, simplicity and security. `MIT` `Go` - [ocserv](https://www.infradead.org/ocserv/) - Cisco AnyConnect-compatible VPN server. ([Source Code](https://gitlab.com/ocserv/ocserv)) `GPL-2.0` `C`