From d32b44ab77efaaa5dad1bd01851fea8f65a44f59 Mon Sep 17 00:00:00 2001 From: laf Date: Sat, 18 Apr 2015 10:44:47 +0100 Subject: [PATCH 1/4] Added link and info about migrating from Observium --- doc/General/Welcome-to-Observium-users.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/General/Welcome-to-Observium-users.md b/doc/General/Welcome-to-Observium-users.md index 2795f3edc..f69a3ecff 100644 --- a/doc/General/Welcome-to-Observium-users.md +++ b/doc/General/Welcome-to-Observium-users.md @@ -10,14 +10,17 @@ IT professionals. See [README.md][2] and the references there for more information about the kind of community we're trying to promote. LibreNMS was forked from [the last GPL-licensed version of Observium][3]. -This means you won't be able to take an existing Observium installation +~~This means you won't be able to take an existing Observium installation later than r3250 and just change it to LibreNMS. This would probably break (although if you were on a version between r3250 and the next database schema change, it might be feasible). Upgrades from versions earlier than r3251 might work. Please try it on an unimportant system and tell us your -experiences! +experiences!~~ + +Thanks to one of our users Dan Brown who has written a migration script to be able move your Observium install over to LibreNMS [Dan Brown][10]. This also takes care of moving from one cpu architect to another. Give it a try :) How LibreNMS will be different from Observium: + - We will have an inclusive community, where it's OK to ask stupid questions, and OK to ask for things that aren't on the roadmap. If you'd like to see something added, add or comment on the relevant issue in our @@ -34,6 +37,7 @@ How LibreNMS will be different from Observium: and painless as possible to create forked or private versions. Reasons why you might want to use Observium instead of LibreNMS: + - You have a financial investment in Observium and aren't concerned about community contributions. - ~~You need functionality that has been added to Observium since r3250.~~ The beauty of LibreNMS is that you can contribute missing features. @@ -41,6 +45,7 @@ Reasons why you might want to use Observium instead of LibreNMS: [philosophy of Free Software/copyleft][6] in general. Reasons why you might want to use LibreNMS instead of Observium: + - You want to work with others on the project, knowing that [your investment of time and effort will not be wasted][7]. - You want to add and experiment with features that are not a priority for @@ -65,5 +70,6 @@ Reasons why you might want to use LibreNMS instead of Observium: "Contribution guidelines" [9]: https://github.com/librenms/librenms/issues "LibreNMS issue database at GitHub" - +[10]: https://vlan50.com/2015/04/17/migrating-from-observium-to-librenms/ +"Migrating from Observium to LibreNMS" From fbf0580d1572fd70d6d88a2215e6740d155d9167 Mon Sep 17 00:00:00 2001 From: laf Date: Sat, 18 Apr 2015 17:43:15 +0100 Subject: [PATCH 2/4] Trying to get strikethrough working --- doc/General/Welcome-to-Observium-users.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/General/Welcome-to-Observium-users.md b/doc/General/Welcome-to-Observium-users.md index f69a3ecff..873e0de3a 100644 --- a/doc/General/Welcome-to-Observium-users.md +++ b/doc/General/Welcome-to-Observium-users.md @@ -10,12 +10,12 @@ IT professionals. See [README.md][2] and the references there for more information about the kind of community we're trying to promote. LibreNMS was forked from [the last GPL-licensed version of Observium][3]. -~~This means you won't be able to take an existing Observium installation +This means you won't be able to take an existing Observium installation later than r3250 and just change it to LibreNMS. This would probably break (although if you were on a version between r3250 and the next database schema change, it might be feasible). Upgrades from versions earlier than r3251 might work. Please try it on an unimportant system and tell us your -experiences!~~ +experiences! Thanks to one of our users Dan Brown who has written a migration script to be able move your Observium install over to LibreNMS [Dan Brown][10]. This also takes care of moving from one cpu architect to another. Give it a try :) @@ -28,7 +28,7 @@ How LibreNMS will be different from Observium: - Development decisions will be community-driven. We want to make software that fulfills its users' needs. See the [ROADMAP][4] for more thoughts on our current plans. -- ~~Development will probably proceed at a slower pace, at least initially.~~ +- Development will probably proceed at a slower pace, at least initially. - There are no plans for a paid version, and we don't anticipate this ever changing. - There are no current plans for paid support, but this may be added later @@ -40,7 +40,7 @@ Reasons why you might want to use Observium instead of LibreNMS: - You have a financial investment in Observium and aren't concerned about community contributions. -- ~~You need functionality that has been added to Observium since r3250.~~ The beauty of LibreNMS is that you can contribute missing features. +- You need functionality that has been added to Observium since r3250. The beauty of LibreNMS is that you can contribute missing features. - You don't like the [GNU General Public License, version 3][5] or the [philosophy of Free Software/copyleft][6] in general. From 430e17750ea4a2361ae3e145de61fdfa2acb065b Mon Sep 17 00:00:00 2001 From: laf Date: Sun, 19 Apr 2015 00:46:59 +0100 Subject: [PATCH 3/4] Removed duplicate In --- html/includes/graphs/generic_data.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/includes/graphs/generic_data.inc.php b/html/includes/graphs/generic_data.inc.php index 63cc15ceb..a85a6c760 100644 --- a/html/includes/graphs/generic_data.inc.php +++ b/html/includes/graphs/generic_data.inc.php @@ -94,7 +94,7 @@ if($format == "octets" || $format == "bytes") $rrd_options .= " COMMENT:'bps Now Ave Max 95th %\\n'"; $rrd_options .= " AREA:in".$format."_max#D7FFC7:"; -$rrd_options .= " AREA:in".$format."#90B040:'In '"; +$rrd_options .= " AREA:in".$format."#90B040:"; $rrd_options .= " LINE:in".$format."#608720:'In '"; #$rrd_options .= " LINE1.25:in".$format."#006600:'In '"; $rrd_options .= " GPRINT:in".$format.":LAST:%6.2lf%s"; From 9da3efe09102ab1c85316c07e03c232d86f93cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= Date: Sun, 19 Apr 2015 13:28:58 +0200 Subject: [PATCH 4/4] Include hostname in alerts_list API command - Include hostname in alerts_list API command - Update API docs --- doc/API/API-Docs.md | 1 + html/includes/api_functions.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/API/API-Docs.md b/doc/API/API-Docs.md index 3e3bdabb8..ddd786d54 100644 --- a/doc/API/API-Docs.md +++ b/doc/API/API-Docs.md @@ -487,6 +487,7 @@ Output: "count": 7, "alerts": [ { + "hostname": "localhost", "id": "1", "device_id": "1", "rule_id": "1", diff --git a/html/includes/api_functions.inc.php b/html/includes/api_functions.inc.php index 161ce3fc8..019b073c2 100644 --- a/html/includes/api_functions.inc.php +++ b/html/includes/api_functions.inc.php @@ -536,7 +536,7 @@ function list_alerts() { $sql = "AND id=?"; array_push($param,$alert_id); } - $alerts = dbFetchRows("SELECT * FROM `alerts` WHERE `state` IN (?) $sql",$param); + $alerts = dbFetchRows("SELECT `D`.`hostname`, `A`.* FROM `alerts` AS `A`, `devices` AS `D` WHERE `D`.`device_id` = `A`.`device_id` AND `A`.`state` IN (?) $sql",$param); $total_alerts = count($alerts); $output = array("status" => "ok", "err-msg" => '', "count" => $total_alerts, "alerts" => $alerts); $app->response->setStatus('200');