mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated bitly link in validate and updated docs to use pastebin service (#6179)

Browse Source 
* replaced bitly link

* updated docs for adding new OS
This commit is contained in:
Neil Lathwood
2017-03-13 02:21:26 +00:00
committed by Tony Murray
parent 014682b60b
commit dad2a5e9cc
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/Support/FAQ.md
View File

@@ -257,17 +257,21 @@ Please see [Supporting a new OS](../Developing/Support-New-OS.md)
#### <a name="faq20"> What information do you need to add a new OS?</a> #### <a name="faq20"> What information do you need to add a new OS?</a>
Under the device, click the gear and select Capture. Under the device, click the gear and select Capture.
Please provide the output of Discovery, Poller, and Snmpwalk as separate non-expiring pastebin.com links. Please provide the output of Discovery, Poller, and Snmpwalk as separate non-expiring https://p.libren.ms/ links.
You can also use the command line to obtain the information. Especially, if snmpwalk results in a large amount of data. You can also use the command line to obtain the information. Especially, if snmpwalk results in a large amount of data.
Replace the relevant information in these commands such as HOSTNAME and COMMUNITY. Use `snmpwalk` instead of `snmpbulkwalk` for v1 devices. Replace the relevant information in these commands such as HOSTNAME and COMMUNITY. Use `snmpwalk` instead of `snmpbulkwalk` for v1 devices.
> These commands will automatically upload the data to LibreNMS servers.
```bash ```bash
./discovery.php -h HOSTNAME -d ./discovery.php -h HOSTNAME -d | ./pbin.sh
./poller.php -h HOSTNAME -r -f -d ./poller.php -h HOSTNAME -r -f -d | ./pbin.sh
snmpbulkwalk -OUneb -v2c -c COMMUNITY HOSTNAME . snmpbulkwalk -OUneb -v2c -c COMMUNITY HOSTNAME . | ./pbin.sh
``` ```
You can use the links provided by these commands within the issue.
If possible please also provide what the OS name should be if it doesn't exist already. If possible please also provide what the OS name should be if it doesn't exist already.
#### <a name="faq9"> What can I do to help?</a> #### <a name="faq9"> What can I do to help?</a>

4
validate.php
View File

@@ -179,7 +179,7 @@ if (empty($strict_mode) === false) {
// Test for correct character set and collation // Test for correct character set and collation
$collation = dbFetchRows("SELECT DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA S WHERE schema_name = '" . $config['db_name'] . "' AND ( DEFAULT_CHARACTER_SET_NAME != 'utf8' OR DEFAULT_COLLATION_NAME != 'utf8_unicode_ci')"); $collation = dbFetchRows("SELECT DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA S WHERE schema_name = '" . $config['db_name'] . "' AND ( DEFAULT_CHARACTER_SET_NAME != 'utf8' OR DEFAULT_COLLATION_NAME != 'utf8_unicode_ci')");
if (empty($collation) !== true) { if (empty($collation) !== true) {
print_fail('MySQL Database collation is wrong: ' . implode(' ', $collation[0]), 'http://bit.ly/2lAG9H8'); print_fail('MySQL Database collation is wrong: ' . implode(' ', $collation[0]), 'https://t.libren.ms/-zdwk');
} }
$collation_tables = dbFetchRows("SELECT T.TABLE_NAME, C.CHARACTER_SET_NAME, C.COLLATION_NAME FROM information_schema.TABLES AS T, information_schema.COLLATION_CHARACTER_SET_APPLICABILITY AS C WHERE C.collation_name = T.table_collation AND T.table_schema = '" . $config['db_name'] . "' AND ( C.CHARACTER_SET_NAME != 'utf8' OR C.COLLATION_NAME != 'utf8_unicode_ci' );"); $collation_tables = dbFetchRows("SELECT T.TABLE_NAME, C.CHARACTER_SET_NAME, C.COLLATION_NAME FROM information_schema.TABLES AS T, information_schema.COLLATION_CHARACTER_SET_APPLICABILITY AS C WHERE C.collation_name = T.table_collation AND T.table_schema = '" . $config['db_name'] . "' AND ( C.CHARACTER_SET_NAME != 'utf8' OR C.COLLATION_NAME != 'utf8_unicode_ci' );");
if (empty($collation_tables) !== true) { if (empty($collation_tables) !== true) {
@@ -188,7 +188,7 @@ if (empty($collation_tables) !== true) {
} }
$collation_columns = dbFetchRows("SELECT TABLE_NAME, COLUMN_NAME, CHARACTER_SET_NAME, COLLATION_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '" . $config['db_name'] . "' AND ( CHARACTER_SET_NAME != 'utf8' OR COLLATION_NAME != 'utf8_unicode_ci' );"); $collation_columns = dbFetchRows("SELECT TABLE_NAME, COLUMN_NAME, CHARACTER_SET_NAME, COLLATION_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '" . $config['db_name'] . "' AND ( CHARACTER_SET_NAME != 'utf8' OR COLLATION_NAME != 'utf8_unicode_ci' );");
if (empty($collation_columns) !== true) { if (empty($collation_columns) !== true) {
print_fail('MySQL column collation is wrong: ', 'http://bit.ly/2lAG9H8'); print_fail('MySQL column collation is wrong: ', 'https://t.libren.ms/-zdwk');
print_list($collation_columns, "\t %s\n"); print_list($collation_columns, "\t %s\n");
} }