From b779d216321db88bd16803914081e2b7a5714f7c Mon Sep 17 00:00:00 2001 From: Dudu Lasry Date: Mon, 29 Jul 2024 13:40:57 +0300 Subject: [PATCH 1/4] 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/4] 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 580be22219ca119158ed4280f5b6b52d1bf9bb64 Mon Sep 17 00:00:00 2001 From: bender2352 <165169475+bender2352@users.noreply.github.com> Date: Mon, 31 Mar 2025 20:49:40 +0200 Subject: [PATCH 3/4] Add Terrateam (#600) * Add Terrateam * OCaml -> Docker Co-authored-by: Kieran <32241933+Ki-er@users.noreply.github.com> * Updated language to OCaml/Docker --------- Co-authored-by: Kieran <32241933+Ki-er@users.noreply.github.com> --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a77431c..e36f24b 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,7 @@ _Related: [IT Asset Management](#it-asset-management)_ - [PHP Censor](https://github.com/php-censor/php-censor) - Open source self-hosted continuous integration server for PHP projects. `BSD-2-Clause` `PHP` - [PHPCI](https://www.phptesting.org/) - Free and open source continuous integration specifically designed for PHP. ([Source Code](https://github.com/block8/phpci)) `BSD-2-Clause` `PHP` - [Strider](https://strider-cd.github.io/) - Open Source Continuous Deployment / Continuous Integration platform. ([Source Code](https://github.com/Strider-CD/strider)) `MIT` `Nodejs` +- [Terrateam](https://terrateam.io) - GitOps-first automation platform for Terraform and OpenTofu workflows with support for self-hosted runners. ([Source Code](https://github.com/terrateamio/terrateam)) `MPL-2.0` `OCaml/Docker` - [werf](https://werf.io/) - Open Source CI/CD tool for building Docker images and deploying to Kubernetes via GitOps. ([Source Code](https://github.com/werf/werf)) `Apache-2.0` `Go` - [Woodpecker](https://woodpecker-ci.org/) - Community fork of Drone that uses Docker containers. ([Source Code](https://github.com/woodpecker-ci/woodpecker)) `Apache-2.0` `Go` From f0ece1ef7c4c705359296c178bb504a578f12093 Mon Sep 17 00:00:00 2001 From: Gareth Date: Mon, 31 Mar 2025 11:54:06 -0700 Subject: [PATCH 4/4] Add backrest to backups category (#597) * Add backrest to README.md Co-authored-by: Kieran <32241933+Ki-er@users.noreply.github.com> --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e36f24b..1400dd0 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,7 @@ _See also: [Restic's list of Linux backup software](https://github.com/restic/ot - [Amanda](https://www.amanda.org/) - Backup and archive many computers on a network to disk, tape changer/drive or cloud storage. ([Source Code](https://github.com/zmanda/amanda)) `MIT` `C` - [Backupninja](https://0xacab.org/liberate/backupninja) - Lightweight, extensible meta-backup system, provides a centralized way to configure and coordinate many different backup utilities. `GPL-2.0` `Shell` - [BackupPC](https://backuppc.github.io/backuppc/) - High-performance, enterprise-grade system for backing up to a server's disk.. ([Source Code](https://github.com/backuppc/backuppc)) `GPL-3.0` `Perl` +- [Backrest](https://garethgeorge.github.io/backrest/) - Backrest is a web UI and orchestrator for restic backup. ([Source Code](https://github.com/garethgeorge/backrest)) `GPL-3.0` `Docker/Go` - [Bareos](https://www.bareos.org/) - Cross-network backup solution which preserves, archives, and recovers data from all major operating systems. ([Source Code](https://github.com/bareos/bareos)) `AGPL-3.0` `C++/C` - [Barman](https://pgbarman.org) - Backup and Recovery Manager for PostgreSQL. ([Source Code](https://github.com/EnterpriseDB/barman)) `GPL-3.0` `Python` - [BorgBackup](https://www.borgbackup.org/) - Deduplicating archiver with compression and authenticated encryption. ([Source Code](https://github.com/borgbackup/borg)) `BSD-3-Clause` `Python`