From b6dce56bb3e39edfb1bfd6cf1279b0cd53bef19b Mon Sep 17 00:00:00 2001 From: Marc Falzon Date: Mon, 16 Jun 2014 16:26:16 +0200 Subject: [PATCH 1/2] Add OpenSMTPD in SMTP category --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 327cd80..580f463 100644 --- a/README.md +++ b/README.md @@ -211,8 +211,9 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v *SMTP servers.* * [Exim](http://www.exim.org/) - Message transfer agent (MTA) developed at the University of Cambridge. -* [Qmail](http://cr.yp.to/qmail.html) - Secure Sendmail replacement. +* [OpenSMTPD](https://opensmtpd.org/) - Secure SMTP server implementation from the OpenBSD project. * [Postfix](http://www.postfix.org/) - Fast, easy to administer, and secure Sendmail replacement. +* [Qmail](http://cr.yp.to/qmail.html) - Secure Sendmail replacement. * [Sendmail](http://www.sendmail.com/sm/open_source/) - Message transfer agent (MTA). ## Software Containers. From 1bad07a9ebec5f834a6371effff01a2dedaacc83 Mon Sep 17 00:00:00 2001 From: Marc Falzon Date: Mon, 16 Jun 2014 16:32:27 +0200 Subject: [PATCH 2/2] Add Riemann in Monitoring category --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 580f463..72f5ec2 100644 --- a/README.md +++ b/README.md @@ -158,11 +158,12 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [ * [Munin](http://munin-monitoring.org/) - Networked resource monitoring tool. * [Naemon](http://www.naemon.org/) - Network monitoring tool based on the Nagios 4 core with performance enhancements and new features. * [Nagios](http://www.nagios.org/) - Computer system, network and infrastructure monitoring software application. +* [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux. +* [Opsview](http://www.opsview.com/solutions/core) - Based on Nagios 4, Opsview Core is ideal for small IT and test environments. +* [Riemann](http://riemann.io/) - Flexible and fast events processor allowing complex events/metrics analysis. * [Sensu](http://sensuapp.org/) - Open source monitoring framework. * [Shinken](http://www.shinken-monitoring.org/) - Another monitoring framework. * [Thruk](http://www.thruk.org/) - Multibackend monitoring webinterface with support for Naemon, Nagios, Icinga and Shinken. -* [Observium](http://www.observium.org/) - SNMP monitoring for servers and networking devices. Runs on linux. -* [Opsview](http://www.opsview.com/solutions/core) - Based on Nagios 4, Opsview Core is ideal for small IT and test environments. * [Xymon](http://www.xymon.com/) - Network monitoring inspired by Big Brother. * [Zabbix](http://www.zabbix.com/) - Eenterprise-class software for monitoring of networks and applications * [Zenoss](http://community.zenoss.org) - Application, server, and network management platform based on Zope.