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 d2291c4bbea497145e4a3d633e520f75b8d37be2 Mon Sep 17 00:00:00 2001 From: Jack Stuart Date: Tue, 22 Apr 2025 00:55:35 +0800 Subject: [PATCH 3/3] Remove PHPCI and IceCoder (unmaintained/archived) (#616) --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index a08d8d7..dfcd809 100644 --- a/README.md +++ b/README.md @@ -194,7 +194,6 @@ _Related: [IT Asset Management](#it-asset-management)_ - [Jenkins](https://jenkins-ci.org/) - Continuous Integration Server. ([Source Code](https://github.com/jenkinsci/jenkins/)) `MIT` `Java` - [Laminar](https://laminar.ohwg.net) - Fast, lightweight, simple and flexible Continuous Integration. ([Source Code](https://github.com/ohwgiles/laminar)) `GPL-3.0` `C++` - [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` @@ -334,7 +333,6 @@ Open-source code editors. - [Geany](https://www.geany.org/) - GTK2 text editor. ([Source Code](https://github.com/geany/geany)) `GPL-2.0` `C/C++` - [GNU Emacs](https://www.gnu.org/software/emacs/) - An extensible, customizable text editor-and more. ([Source Code](https://github.com/emacs-mirror/emacs)) `GPL-3.0` `C` - [Haroopad](http://pad.haroopress.com/) - Markdown editor with live preview. ([Source Code](https://github.com/rhiokim/haroopad)) `GPL-3.0` `JavaScript` -- [ICEcoder](https://icecoder.net/) - Code editor awesomeness, built with common web languages. ([Demo](http://demo.icecoder.net), [Source Code](https://github.com/icecoder/ICEcoder)) `MIT` `PHP` - [jotgit](https://github.com/jdleesmiller/jotgit) - Git-backed real-time collaborative code editing. `MIT` `Nodejs` - [KDevelop](https://www.kdevelop.org/) - IDE by the people behind KDE. ([Source Code](https://invent.kde.org/kdevelop/kdevelop)) `GFDL-1.2` `C++` - [Micro](https://micro-editor.github.io/) - A modern and intuitive terminal-based text editor. ([Source Code](https://github.com/zyedidia/micro)) `MIT` `Go`