Skip to content

Commit 0bdc17d

Browse files
committed
[docs] Various minor adjustments
1 parent f57120b commit 0bdc17d

File tree

8 files changed

+347
-251
lines changed

8 files changed

+347
-251
lines changed

user/django-settings.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ add any python instruction to define and manipulate settings via the
6565
},
6666
}
6767

68-
OPENWISP_ADMIN_THEME_LINKS = [
69-
{'type': 'text/css', 'href': '/static/admin/css/openwisp.css', 'rel': 'stylesheet', 'media': 'all'},
70-
{'type': 'text/css', 'href': '/static/custom.css', 'rel': 'stylesheet', 'media': 'all'},
71-
{'type': 'image/x-icon', 'href': '/static/favicon.png', 'rel': 'icon'}
72-
]
73-
7468
This allows for great flexibility in configuring and extending OpenWISP,
7569
because additional custom modules can be added and configured too.
7670

user/firmware-upgrades.rst

Lines changed: 64 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ Firmware Upgrades
22
=================
33

44
OpenWISP Firmware Upgrader has been introduced in OpenWISP 20 and focuses
5-
on allowing users to maintain the firmware of their network devices up to date.
5+
on allowing users to maintain the firmware of their network
6+
devices up to date.
67

78
.. contents:: **Table of Contents**:
89
:backlinks: none
@@ -26,95 +27,112 @@ Quickstart Guide
2627

2728
Requirements:
2829

29-
- Devices running at least OpenWRT 12.09 Attitude Adjustment, older versions
30-
of OpenWRT have not worked at all in our tests
30+
- Devices running at least OpenWRT 12.09 Attitude Adjustment,
31+
older versions of OpenWRT have not worked at all in our tests
3132
- Devices must have enough free RAM to be able to upload the
3233
new image to ``/tmp``
3334

3435
1. Create a category
3536
~~~~~~~~~~~~~~~~~~~~
3637

3738
Create a category for your firmware images
38-
by going to *Firmware management > Firmware categories > Add firmware category*,
39+
by going to
40+
*Firmware management > Firmware categories > Add firmware category*,
3941
if you use only one firmware type in your network, you could simply
4042
name the category "default" or "standard".
4143

4244
.. image:: https://raw.githubusercontent.com/openwisp/openwisp-firmware-upgrader/docs/docs/images/quickstart-category.gif
4345

44-
If you use multiple firmware images with different features, create one category
45-
for each firmware type, eg:
46+
If you use multiple firmware images with different features,
47+
create one category for each firmware type, eg:
4648

4749
- WiFi
4850
- SDN router
4951
- LoRa Gateway
5052

5153
This is necessary in order to perform mass upgrades only on specific
52-
firmware categories when, for example, a new *LoRa Gateway* firmware becomes available.
54+
firmware categories when, for example, a new
55+
*LoRa Gateway* firmware becomes available.
5356

5457
2. Create the build object
5558
~~~~~~~~~~~~~~~~~~~~~~~~~~
5659

5760
Create a build a build object by going to
5861
*Firmware management > Firmware builds > Add firmware build*,
59-
the build object is related to a firmware category and is the collection of the
60-
different firmware images which have been compiled for the different hardware models
61-
supported by the system.
62+
the build object is related to a firmware category and
63+
is the collection of the different firmware images which have
64+
been compiled for the different hardware models supported by the system.
6265

63-
The version field indicates the firmware version, the change log field is optional but
64-
we recommend filling it to help operators know the differences between each version.
66+
The version field indicates the firmware version,
67+
the change log field is optional but we recommend filling it to help
68+
operators know the differences between each version.
6569

6670
.. image:: https://raw.githubusercontent.com/openwisp/openwisp-firmware-upgrader/docs/docs/images/quickstart-build.gif
6771

68-
An important but optional field of the build model is **OS identifier**, this field
69-
should match the value of the **Operating System** field which gets automatically filled
70-
during device registration, eg: ``OpenWrt 19.07-SNAPSHOT r11061-6ffd4d8a4d``.
72+
An important but optional field of the build model is **OS identifier**,
73+
this field should match the value of the **Operating System**
74+
field which gets automatically filled
75+
during device registration, eg:
76+
``OpenWrt 19.07-SNAPSHOT r11061-6ffd4d8a4d``.
7177
It is used by the firmware-upgrader module to automatically
72-
create ``DeviceFirmware`` objects for existing devices or when new devices register.
73-
A ``DeviceFirmware`` object represent the relationship between a device and a firmware image,
78+
create ``DeviceFirmware`` objects for existing devices or when
79+
new devices register.
80+
81+
A ``DeviceFirmware`` object represent the relationship between a
82+
device and a firmware image,
7483
it basically tells us which firmware image is installed on the device.
7584

7685
To find out the exact value to use, you should either do a
77-
test flash on a device and register it to the system or you should inspect the firmware image
86+
test flash on a device and register it to the system or you
87+
should inspect the firmware image
7888
by decompressing it and find the generated value in the firmware image.
7989

80-
If you're not sure about what **OS identifier** to use, just leave it empty, you can fill
81-
it later on when you find out.
90+
If you're not sure about what **OS identifier** to use,
91+
just leave it empty, you can fill it later on when you find out.
8292

8393
Now save the build object to create it.
8494

8595
3. Upload images to the build
8696
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8797

88-
Now is time to add images to the build, we suggest adding one image at time.
89-
Alternatively the `REST API <#rest-api>`__ can be used to automate this step.
98+
Now is time to add images to the build, we suggest adding one
99+
image at time. Alternatively the
100+
`REST API <https://github.com/openwisp/openwisp-firmware-upgrader/tree/1.0#rest-api>`__
101+
can be used to automate this step.
90102

91103
.. image:: https://raw.githubusercontent.com/openwisp/openwisp-firmware-upgrader/docs/docs/images/quickstart-firmwareimage.gif
92104

93105
If you use a hardware model which is not listed in the image types, if the
94-
hardware model is officially supported by OpenWRT, you can send us a pull-request to add it,
95-
otherwise you can use `the setting OPENWISP_CUSTOM_OPENWRT_IMAGES <#openwisp_custom_openwrt_images>`__
106+
hardware model is officially supported by OpenWRT,
107+
you can send us a pull-request to add it,
108+
otherwise you can use
109+
`the setting OPENWISP_CUSTOM_OPENWRT_IMAGES
110+
<https://github.com/openwisp/openwisp-firmware-upgrader/tree/1.0#openwisp_custom_openwrt_images>`__
96111
to add it.
97112

98113
4. Perform a firmware upgrade to a specific device
99114
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
100115

101116
.. image:: https://raw.githubusercontent.com/openwisp/openwisp-firmware-upgrader/docs/docs/images/quickstart-devicefirmware.gif
102117

103-
Once a new build is ready, has been created in the system and its image have been uploaded,
104-
it will be the time to finally upgrade our devices.
118+
Once a new build is ready, has been created in the system and its
119+
image have been uploaded, it will be the time to finally
120+
upgrade our devices.
105121

106122
To perform the upgrade of a single device, navigate to the device details,
107123
then go to the "Firmware" tab.
108124

109-
If you correctly filled **OS identifier** in step 2, you should have a situation
110-
similar to the one above: in this example, the device is using version ``1.0``
111-
and we want to upgrade it to version ``2.0``, once the new firmware image
112-
is selected we just have to hit save, then a new tab will appear in the device page
113-
which allows us to see what's going on during the upgrade.
125+
If you correctly filled **OS identifier** in step 2,
126+
you should have a situation similar to the one above: in this example,
127+
the device is using version ``1.0`` and we want to upgrade it to
128+
version ``2.0``, once the new firmware image is selected we just have to
129+
hit save, then a new tab will appear in the device page which allows us
130+
to see what's going on during the upgrade.
131+
132+
Right now, the update of the upgrade information is not asynchronous yet,
133+
so you will have to reload the page periodically to find new information.
114134

115-
Right now, the update of the upgrade information is not asynchronous yet, so you will
116-
have to reload the page periodically to find new information. This will be addressed
117-
in a future release.
135+
This will be addressed in a future release.
118136

119137
5. Performing mass upgrades
120138
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -134,21 +152,24 @@ At this stage you can try a mass upgrade by doing the following:
134152

135153
.. image:: https://raw.githubusercontent.com/openwisp/openwisp-firmware-upgrader/docs/docs/images/quickstart-batch-upgrade.gif
136154

137-
At this point you should see a summary page which will inform you of which devices
138-
are going to be upgraded, you can either confirm the operation or cancel.
155+
At this point you should see a summary page which will inform you of
156+
which devices are going to be upgraded, you can either confirm the
157+
operation or cancel.
158+
159+
Once the operation is confirmed you will be redirected to a page
160+
in which you can monitor the progress of the upgrade operations.
139161

140-
Once the operation is confirmed you will be redirected to a page in which you
141-
can monitor the progress of the upgrade operations.
162+
Right now, the update of the upgrade information is not asynchronous yet,
163+
so you will have to reload the page periodically to find new information.
142164

143-
Right now, the update of the upgrade information is not asynchronous yet, so you will
144-
have to reload the page periodically to find new information. This will be addressed
145-
in a future release.
165+
This will be addressed in a future release.
146166

147167
Find out more about OpenWISP Firmware Upgrader
148168
----------------------------------------------
149169

150-
For more information about the features offered by OpenWISP Firmware Upgrader
151-
we refer to the following sections of its README:
170+
For more information about the features offered by
171+
OpenWISP Firmware Upgrader we refer to the following sections
172+
of its documentation:
152173

153174
- `List of the available features
154175
<https://github.com/openwisp/openwisp-firmware-upgrader/tree/1.0#openwisp-firmware-upgrader>`_

user/monitoring.rst

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ and other actions like
6565

6666
There are mainly two deployment scenarios for OpenWISP:
6767

68-
1. the OpenWISP server is deployed on the public internet and the devices are
69-
geographically distributed across different locations:
68+
1. the OpenWISP server is deployed on the public internet and the
69+
devices are geographically distributed across different locations:
7070
**in this case a management tunnel is needed**
71-
2. the OpenWISP server is deployed on a computer/server which is located in
72-
the same Layer 2 network (that is, in the same LAN) where the devices
73-
are located.
71+
2. the OpenWISP server is deployed on a computer/server which is
72+
located in the same Layer 2 network (that is, in the same LAN)
73+
where the devices are located.
7474
**in this case a management tunnel is NOT needed**
7575

7676
1. Public internet deployment
@@ -112,8 +112,9 @@ In this scenario, the following requirements are needed:
112112
which gets an IP address assigned to it and which is reachable from
113113
the OpenWISP server.
114114

115-
- The devices must be configured to join the management tunnel automatically,
116-
either via a pre-existing configuration in the firmware or via an
115+
- The devices must be configured to join the management
116+
tunnel automatically, either via a pre-existing configuration in
117+
the firmware or via an
117118
`OpenWISP Template <https://openwisp.io/docs/user/templates.html>`_.
118119

119120
- The `openwisp-config <https://github.com/openwisp/openwisp-config>`_
@@ -123,7 +124,8 @@ In this scenario, the following requirements are needed:
123124
use the management IP for reaching the device.
124125

125126
For example, if the *management interface* is named ``tun0``,
126-
the openwisp-config configuration should look like the following example:
127+
the openwisp-config configuration should look like the following
128+
example:
127129

128130
.. code-block:: text
129131

user/network-topology.rst

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Network Topology
77
`OpenWISP Network Topology
88
<https://github.com/openwisp/openwisp-network-topology/tree/1.0>`_
99
is a network topology collector and visualizer
10-
web application and API, it allows to collect network topology data from different
11-
networking software (dynamic mesh routing protocols, OpenVPN), store it,
12-
visualize it, edit its details, it also provides hooks (a.k.a
10+
web application and API, it allows to collect network topology data
11+
from different networking software (dynamic mesh routing protocols,
12+
OpenVPN), store it, visualize it, edit its details, it also provides
13+
hooks (a.k.a
1314
`Django signals <https://docs.djangoproject.com/en/4.0/topics/signals/>`_)
1415
to execute code when the status of a link changes.
1516

@@ -44,9 +45,10 @@ Quickstart Guide
4445
This module works by periodically collecting the network topology
4546
graph data of the `supported networking software or formats
4647
<https://github.com/openwisp/openwisp-network-topology/tree/1.0#available-features>`_.
47-
The data has to be either fetched by the application or received in POST API
48-
requests, therefore after deploying the application, additional steps are required
49-
to make the data collection and visualization work, read on to find out how.
48+
The data has to be either fetched by the application or received in
49+
POST API requests, therefore after deploying the application,
50+
additional steps are required to make the data collection and
51+
visualization work, read on to find out how.
5052

5153
Creating a topology
5254
^^^^^^^^^^^^^^^^^^^
@@ -56,12 +58,14 @@ Creating a topology
5658
1. Create a topology object by going to *Network Topology* > *Topologies*
5759
> *Add topology*.
5860
2. Give an appropriate label to the topology.
59-
3. Select the *topology format* from the dropdown menu. The *topology format*
60-
determines which parser should be used to process topology data.
61+
3. Select the *topology format* from the dropdown menu.
62+
The *topology format* determines which parser should be used
63+
to process topology data.
6164
4. Select the *Strategy* for updating this topology.
6265

63-
- If you are using `FETCH strategy <https://github.com/openwisp/openwisp-network-topology/tree/1.0#fetch-strategy>`_, then enter the
64-
URL for fetching topology data in the *Url* field.
66+
- If you are using `FETCH strategy
67+
<https://github.com/openwisp/openwisp-network-topology/tree/1.0#fetch-strategy>`_,
68+
then enter the URL for fetching topology data in the *Url* field.
6569
- If you are using `RECEIVE strategy <https://github.com/openwisp/openwisp-network-topology/tree/1.0#receive-strategy>`_, you will get the
6670
*URL* for sending topology data. The *RECEIVE* strategy provides an
6771
additional field *expiration time*. This can be used to add delay in
@@ -76,11 +80,12 @@ Sending data for topology with RECEIVE strategy
7680

7781
E.g., in our case the URL is ``http://127.0.0.1:8000/api/v1/network-topology/topology/d17e539a-1793-4be2-80a4-c305eca64fd8/receive/?key=cMGsvio8q0L0BGLd5twiFHQOqIEKI423``.
7882

79-
2. Create a script (eg: ``/opt/send-topology.sh``) which sends the topology
80-
data using ``POST``, in the example script below we are sending the
81-
status log data of OpenVPN but the same code can be applied to other
82-
formats by replacing ``cat /var/log/openvpn/tun0.stats`` with the
83-
actual command which returns the network topology output:
83+
2. Create a script (eg: ``/opt/send-topology.sh``) which sends the
84+
topology data using ``POST``, in the example script below we are
85+
sending the status log data of OpenVPN but the same code can be
86+
applied to other formats by replacing
87+
``cat /var/log/openvpn/tun0.stats`` with the actual command which
88+
returns the network topology output:
8489

8590
.. code-block:: shell
8691
@@ -95,7 +100,8 @@ Sending data for topology with RECEIVE strategy
95100
http://127.0.0.1:8000/api/v1/network-topology/topology/d17e539a-1793-4be2-80a4-c305eca64fd8/receive/?key=cMGsvio8q0L0BGLd5twiFHQOqIEKI423
96101
97102
3. Add the ``/opt/send-topology.sh`` script created in the previous step
98-
to the crontab, here's an example which sends the topology data every 5 minutes:
103+
to the crontab, here's an example which sends the topology
104+
data every 5 minutes:
99105

100106
.. code-block:: shell
101107
@@ -119,8 +125,8 @@ Sending data for topology with RECEIVE strategy
119125
Find out more about OpenWISP Network Topology
120126
---------------------------------------------
121127

122-
For more information about the features offered by OpenWISP Network Topology
123-
we refer to the following sections of its README:
128+
For more information about the features offered by OpenWISP Network
129+
Topology we refer to the following sections of its documentation:
124130

125131
- `List of the available features
126132
<https://github.com/openwisp/openwisp-network-topology/tree/1.0#available-features>`_

0 commit comments

Comments
 (0)