Skip to content

Commit 071173f

Browse files
authored
Remove tabs from yaml (librenms#14437)
* Remove tabs from yaml * Remove tabs from random files
1 parent 9d00b0c commit 071173f

File tree

18 files changed

+271
-271
lines changed

18 files changed

+271
-271
lines changed

.git-blame-ignore-revs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77

88
# Apply fixes from StyleCI
99
77c531527c0bf218038f8349e81f50d5386739a6
10-
82f43cb98dbe25d6e6fea4e787fa26aca898e41d
10+
82f43cb98dbe25d6e6fea4e787fa26aca898e41d
1111
29f45ca352a8c5d5c308f93ce1240b7fdfc1c936
1212
2fc3a2121107c796cb0cf3e310c3a869a5b5798f
1313

14-
# Fix coding style part 2
14+
# Fix coding style part 2
1515
d8693f05ae4d9ec884cd2c2d850e7f78ba9dc2ae
1616

17-
# Merge pull request #1449 from job/coding_style_old_files2
17+
# Merge pull request #1449 from job/coding_style_old_files2
1818
61b14557ce45f8c6d90482075464aad1fae5e209
1919

20-
# Merge pull request #1444 from job/coding_style_old_files2
20+
# Merge pull request #1444 from job/coding_style_old_files2
2121
4ebabc634ab098d4f9721ea7f357baf029a6bf9c
2222

23-
# Merge pull request #1431 from job/coding_style_old_files
23+
# Merge pull request #1431 from job/coding_style_old_files
2424
89206b393978d8b42e3755698ca5542be7277270

AUTHORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ LibreNMS contributors:
146146
- Joseph Eames <[email protected]> (j-ems)
147147
- Eric Conroy <[email protected]> (NetworkNub)
148148
- Timothy Willey <[email protected]> (twilley)
149-
- Jon Ward <[email protected]> (yon2004)
149+
- Jon Ward <[email protected]> (yon2004)
150150
- Ian Viemeister <[email protected]> (iviemeister)
151151
- Thane Gill <[email protected]> (thanegill)
152152
- Christoffer Stokbæk <[email protected]> (stokbaek)

app/Plugins/ExamplePlugin/resources/views/device-overview.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<div class="col-sm-12">
1010
{!! Str::markdown($device->notes ?? '') !!}
1111
</div>
12-
</div>
13-
</div>
14-
</div>
12+
</div>
13+
</div>
14+
</div>
1515
</div>
1616
</div>

app/Plugins/ExamplePlugin/resources/views/page.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<div class="pull-left" style="margin-top: 5px;">
44
<span style="font-size: 20px;">{{ $title }}</a></span><br>
55
Description
6-
</div>
6+
</div>
77
</div>
88
</div>

doc/Extensions/Galera-Cluster.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This is currently being tested, use at your own risk.
44

55
LibreNMS can be used with a MariaDB Galera Cluster. This is a Multi Master cluster, meaning each
66
node in the cluster can read and write to the database. They all have the same ability. LibreNMS will
7-
randomly choose a working node to read and write requests to.
7+
randomly choose a working node to read and write requests to.
88

99

1010
For more information see
@@ -14,7 +14,7 @@ For more information see
1414
## Getting Started
1515

1616
* It is best practice to have a minimum of 3 nodes in the cluster, A odd number of nodes is recommended in the event nodes have a disagreement on data, they will have a tie breaker.
17-
* It's recommended that all servers be similar in hardware performance, cluster performance can be affected by the slowest server in the cluster.
17+
* It's recommended that all servers be similar in hardware performance, cluster performance can be affected by the slowest server in the cluster.
1818
* Backup the database before starting, and backing up the database regularly is still recommended even in a working cluster environment.
1919

2020
## Install and Configure Galera
@@ -52,20 +52,20 @@ wsrep_sst_method=rsync
5252
wsrep_node_address="192.168.1.35"
5353
wsrep_node_name="librenms1.35"
5454
```
55-
Change the following values for your environment.
55+
Change the following values for your environment.
5656
* wsrep_cluster_address - All the IP address's of your nodes.
5757
* wsrep_cluster_name - Name of cluster, should be the same for all nodes
5858
* wsrep_node_address - IP address of this node.
5959
* wsrep_node_name - Name of this node.
6060

6161
### Edit LibreNMS .env
6262

63-
LibreNMS supports up to 9 galera nodes, you define these nodes in the .env file. For each node we have the ability to define if this librenms installation/poller is able to write, read or both to that node.
64-
The galera nodes you define here can be the same or differnt for each librenms poller. If you have a poller you only want to write/read to one galera node, you would simply add one DB_HOST, and omit all the rest. This allows you to precisely control what galera nodes a librenms poller is reading and or writing too.
63+
LibreNMS supports up to 9 galera nodes, you define these nodes in the .env file. For each node we have the ability to define if this librenms installation/poller is able to write, read or both to that node.
64+
The galera nodes you define here can be the same or differnt for each librenms poller. If you have a poller you only want to write/read to one galera node, you would simply add one DB_HOST, and omit all the rest. This allows you to precisely control what galera nodes a librenms poller is reading and or writing too.
6565

6666
* DB_HOST is always set to read/write.
6767
* DB_HOST must be set, however, it does not have to be the same on each poller, it can be different as long as it's part of the same galera cluster.
68-
* If the node that is set to DB_HOST is down, things like ```lnms db``` command no longer work, as they only use DB_HOST and don't failover to other nodes.
68+
* If the node that is set to DB_HOST is down, things like ```lnms db``` command no longer work, as they only use DB_HOST and don't failover to other nodes.
6969
* Set DB_CONNECTION=mysql_cluster to enable
7070
* DB_STICKY can be used if you are pulling out of sync data form the database in a read request. For more information see
7171
<https://laravel.com/docs/database#the-sticky-option>
@@ -88,7 +88,7 @@ DB_USERNAME=librenms
8888
DB_PASSWORD=password
8989
```
9090
The above .env on a librenms installation/poller would communicate to each galera node as follows.
91-
91+
9292
* 192.168.1.35 - Read/Write
9393
* 192.168.1.36 - Read/Write
9494
* 192.168.1.37 - Read/Write
@@ -98,17 +98,17 @@ The above .env on a librenms installation/poller would communicate to each galer
9898
### Starting Galera Cluster for the first time.
9999

100100
1) Shutdown MariaDB server on ALL nodes.
101-
```bash
102-
sudo systemctl stop mariadb-server
103-
```
101+
```bash
102+
sudo systemctl stop mariadb-server
103+
```
104104
2) On the server with your existing database or any mariadb server if you are starting without existing data, run the following command
105-
```bash
106-
sudo galera_new_cluster
107-
```
105+
```bash
106+
sudo galera_new_cluster
107+
```
108108
3) Start the rest of the nodes normally.
109-
```bash
110-
sudo systemctl start mariadb-server
111-
```
109+
```bash
110+
sudo systemctl start mariadb-server
111+
```
112112

113113
### Galera Cluster Status
114114

@@ -122,7 +122,7 @@ In the database run following mysql query
122122
SHOW GLOBAL STATUS LIKE 'wsrep_%';
123123
```
124124

125-
| Variable Name | Value | Notes |
125+
| Variable Name | Value | Notes |
126126
| :----: | :----: | :----: |
127127
| ----------------------------------- | ----------------------------------------------------------------|---------------------------------------------------------|
128128
| wsrep_cluster_size | 2 | Current number of nodes in Cluster |
@@ -150,6 +150,6 @@ seqno: -1
150150
safe_to_bootstrap: 1
151151
```
152152

153-
If the safe_to_bootstrap = 1, then Galera determined that this node has the most up-to-date database and can be safeley used to start the cluster.
153+
If the safe_to_bootstrap = 1, then Galera determined that this node has the most up-to-date database and can be safeley used to start the cluster.
154154

155155
Once you have found a node that can be used for starting the cluster, follow the steps in starting for the first time.

0 commit comments

Comments
 (0)