Skip to content

Commit 45a0ff5

Browse files
committed
Improve quality of rendered images/graphs
1 parent 0d90a62 commit 45a0ff5

21 files changed

+97
-76
lines changed

containthedocs-singlehtml.sh

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
set -x
4+
5+
COMMAND="make -C docs singlehtml"
6+
7+
. ./containthedocs-image
8+
9+
exec docker run --rm -it \
10+
-v "$PWD":"$PWD" --workdir "$PWD" \
11+
${DOCKER_RUN_ARGS} \
12+
-e "LOCAL_USER_ID=$(id -u)" \
13+
${DOC_IMG} ${COMMAND}

docs/class1/conclusion.rst

+11-12
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ Conclusion
77
rankdir="LR"
88
ranksep=.4
99
splines=ortho
10-
node [fontsize=10,style="rounded,filled",shape=box,color=palegreen,margin="0.05,0.05",height=0.1]
11-
fontname = "arial-bold"
10+
node [fontsize=10,style="rounded,filled",shape=box,color=palegreen,margin="0.05,0.05",height=0.1]
1211
fontsize = 10
1312
labeljust="l"
14-
consumer [label="AppDev, DevOps, NetOps",color="gray72"]
13+
consumer [label="AppDev,\nDevOps,\nNetOps",color="gray72"]
1514
environment [label="Environment",color="gray72"]
1615
subgraph cluster_class1 {
1716
style = "rounded,filled"
@@ -20,7 +19,7 @@ Conclusion
2019
label = "Class 1: Introduction to Automation & Orchestration"
2120
bigip [label="BIG-IP"]
2221
iapps [label="iApp Templates\n& Deployments"]
23-
iwf [label="iWorkflow Service Templates,\nCatalog & Deployment"]
22+
iwf [label="iWorkflow Service\nTemplates,\nCatalog & Deployment"]
2423
{
2524
rank=same
2625
rest_basics [label="REST Basics"]
@@ -31,7 +30,7 @@ Conclusion
3130
transactions [label="Transactions"]
3231
rest_basics -> authentication -> globalsettings -> networking -> clustering -> transactions -> bigip
3332
}
34-
{
33+
{
3534
rank=same
3635
iapp_basics [label="iApp Basics"]
3736
iapp_templates [label="iApp Templates"]
@@ -44,16 +43,16 @@ Conclusion
4443
templates [label="Templates"]
4544
catalog [label="Catalog"]
4645
deployments [label="Deployments"]
47-
onboarding -> templates -> catalog -> deployments -> iwf
48-
}
46+
onboarding -> templates -> catalog -> deployments -> iwf
47+
}
4948
}
5049
consumer -> iwf -> iapps -> bigip -> environment
5150
}
5251

5352
In this class we learned the base concepts and skills required to effectively
5453
automate the F5 |bip| platform. The diagram above shows a high-level view of
55-
the different components to this base level of knowledge. In subsequent classes
56-
we will expand on the core concepts and knowledge learned in this class.
54+
the different components to this base level of knowledge. In subsequent classes
55+
we will expand on the core concepts and knowledge learned in this class.
5756

5857
This content has been created with a DevOps methodology and fully Continuous
5958
Toolchain. All content contained here is sourced from the following GitHub
@@ -64,15 +63,15 @@ https://github.com/f5devcentral/f5-automation-labs/
6463
Bug Reports and Requests for Enhancement are handled in two ways:
6564

6665
- Fork the Github Repo, fix or enhance as required, and submit a Pull Request
67-
66+
6867
- https://help.github.com/articles/creating-a-pull-request-from-a-fork/
6968

70-
- Open an
69+
- Open an
7170
`Issue <https://github.com/f5devcentral/f5-automation-labs/issues>`_ within
7271
the repository.
7372

7473
Lastly, this content would not be possible without the contributions from many
75-
F5 Employees, Partners, and Customers. A full list of contributors to this
74+
F5 Employees, Partners, and Customers. A full list of contributors to this
7675
content can be found at:
7776

7877
https://github.com/f5devcentral/f5-automation-labs/graphs/contributors

docs/class1/module1/lab1.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 1.1: Exploring the iControl REST API
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module1/lab2.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 1.2: REST API Authentication & ‘example’ Templates
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module1/lab3.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 1.3: Review/Set Device Settings
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module1/lab4.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 1.4: Basic Network Connectivity
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module1/lab5.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 1.5: Building Imperative Workflows with Postman Collections
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module1/lab6.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 1.6: Build a BIG-IP Cluster using a Collection
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module1/lab7.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 1.7: Build a Basic LTM Config using REST Transactions
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module1/module1.rst

+12-13
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ Module 1: Imperative Automation with the |bip| |icr|
88
digraph breadcrumb {
99
rankdir="LR"
1010
ranksep=.4
11-
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
12-
fontname = "arial-bold"
11+
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
1312
fontsize = 10
1413
labeljust="l"
1514
subgraph cluster_provider {
@@ -31,7 +30,7 @@ Module 1: Imperative Automation with the |bip| |icr|
3130
}
3231
iwf_deploy -> iwf_catalog -> iwf_templates -> iapps -> bigip
3332
}
34-
33+
3534
In this module you will learn the basic concepts required to interact
3635
with the BIG-IP iControl REST API. Additionally, you will walk through a
3736
typical Device Onboarding workflow to deploy a fully functional
@@ -43,24 +42,24 @@ focus on demonstrating an **Imperative** approach to automation.
4342
device (management IP configuration and licensing has been completed).
4443
BIG-IP B will have some minimal configuration pre-loaded. In real-world
4544
scenario, it would be necessary to perform Device Onboarding functions
46-
on ALL BIG-IP devices. In this lab exercise, we chose to perform it only
45+
on ALL BIG-IP devices. In this lab exercise, we chose to perform it only
4746
on a single device due to lab time allocation constraints.
4847

49-
.. NOTE:: In order to confirm the results of REST API calls made in this lab, it's
50-
recommended to keep GUI/SSH sessions to BIG-IP and iWorkflow devices open.
51-
By default, BIG-IP and iWorkflow will log all the REST API related events locally
52-
to **restjavad.0.log** . These logs can also be directed to a remote syslog server
53-
(see https://support.f5.com/csp/article/K13080). On a side note, the **ltm**
54-
log files listed below contains log messages specific to BIG-IP local
55-
traffic management events.
48+
.. NOTE:: In order to confirm the results of REST API calls made in this lab, it's
49+
recommended to keep GUI/SSH sessions to BIG-IP and iWorkflow devices open.
50+
By default, BIG-IP and iWorkflow will log all the REST API related events locally
51+
to **restjavad.0.log** . These logs can also be directed to a remote syslog server
52+
(see https://support.f5.com/csp/article/K13080). On a side note, the **ltm**
53+
log files listed below contains log messages specific to BIG-IP local
54+
traffic management events.
5655

5756
- BIG-IP:
5857

5958
- /var/log/ltm
60-
59+
6160
- /var/log/restjavad.0.log
6261

63-
- iWorkflow:
62+
- iWorkflow:
6463

6564
- /var/log/restjavad.0.log
6665

docs/class1/module2/lab1.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 2.1: Exploring iApps
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module2/lab2.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 2.2: Deploying iApp Templates on BIG-IP
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module2/lab3.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 2.3: Create iApp Deployments using the REST API
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module2/module2.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Module 2: Abstracting Services using iApp Templates
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {
+23-24
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
digraph iwf_onboarding {
22
rankdir = TB
3-
fontname = "arial-bold"
43
ranksep = .2
54
splines = ortho
6-
node [fontsize=10,style="rounded,filled",shape=box,color=navajowhite,margin="0.05,0.05",height=0.1]
7-
edge [arrowsize=0.5,fontsize=8]
5+
node [fontsize=10,style="rounded,filled",shape=box,color=navajowhite,margin="0.05,0.05",height=0.1]
6+
edge [arrowsize=0.5,fontsize=8]
87

98
{
10-
rank=min
9+
rank=min
1110
start [label="Start iWorkflow Onboarding",color="chartreuse3"]
1211
}
13-
12+
1413
subgraph cluster1 {
1514
style = "rounded,filled"
1615
color = lightgrey
@@ -23,8 +22,8 @@ digraph iwf_onboarding {
2322
}
2423
auth_verify [label="Verify Authentication Works"]
2524
auth_settimeout [label="Set Auth Token Timeout"]
26-
}
27-
25+
}
26+
2827
subgraph cluster2 {
2928
style = "rounded,filled"
3029
color = lightgrey
@@ -42,16 +41,16 @@ digraph iwf_onboarding {
4241
}
4342
discover_get [label="Get Discovered Devices"]
4443
discover_check_state [label="state=ACTIVE",color=orange2]
45-
}
46-
44+
}
45+
4746
subgraph cluster3 {
4847
style = "rounded,filled"
4948
color = lightgrey
5049

5150
create_start [label="Create iWorkflow Tenant",color="navajowhite3"]
52-
{
51+
{
5352
create_tenant [label="Create iWorkflow Tenant &&#92;nBIG-IP Connector"]
54-
create_tenant_user [label="Create Tenant User"]
53+
create_tenant_user [label="Create Tenant User"]
5554
create_role [label="Assign User to Tenant Admin Role"]
5655
}
5756
{
@@ -60,33 +59,33 @@ digraph iwf_onboarding {
6059
iwf_connector_uuid [color=cadetblue3]
6160
}
6261
create_assign [label="Assign Connector to Tenant"]
63-
}
64-
62+
}
63+
6564
subgraph cluster4 {
6665
style = "rounded,filled"
6766
color = lightgrey
68-
67+
6968
iapp_start [label="Install App Services&#92;niApp Template",color="navajowhite3"]
7069
{
7170
rank=same
7271
iapp_install [label="Install App Services&#92;nTemplate on iWorkflow"]
7372
iwf_appsvcs_name [color=cadetblue3]
7473
}
75-
}
74+
}
7675

7776
{
78-
rank=max
77+
rank=max
7978
end [label="End iWorkflow Onboarding",color=indianred1]
8079
}
81-
80+
8281
/* Imperative Process Flow */
83-
{
82+
{
8483
edge[style=solid]
85-
start -> auth_start
84+
start -> auth_start
8685
auth_start -> auth_gettoken -> auth_verify -> auth_settimeout -> discover_start
8786
discover_start -> discover_bip_a -> discover_bip_b -> discover_get -> discover_check_state
8887
discover_check_state -> create_start [taillabel="Yes "]
89-
discover_check_state -> discover_get [taillabel="No "]
88+
discover_check_state -> discover_get [taillabel="No "]
9089
create_start -> create_tenant -> create_tenant_user -> create_role -> create_connector -> create_assign -> iapp_start
9190
iapp_start -> iapp_install -> end
9291
}
@@ -95,19 +94,19 @@ digraph iwf_onboarding {
9594

9695

9796
/* Variable Read/Writes */
98-
{
99-
constraint=false
97+
{
98+
constraint=false
10099
edge[style=dashed]
101100
auth_gettoken -> iwf_auth_token
102101
iwf_auth_token -> {auth_verify auth_settimeout}
103102
iwf_auth_token -> {discover_bip_a discover_bip_b discover_get}
104103
iwf_auth_token -> {create_tenant create_tenant_user create_role create_connector create_assign}
105-
iwf_auth_token -> {iapp_install}
104+
iwf_auth_token -> {iapp_install}
106105
discover_bip_a -> iwf_bigip_a_uuid
107106
iwf_bigip_a_uuid -> create_connector
108107
discover_bip_b -> iwf_bigip_b_uuid
109108
iwf_bigip_b_uuid -> create_connector
110-
create_connector -> iwf_connector_uuid -> create_assign
109+
create_connector -> iwf_connector_uuid -> create_assign
111110
iapp_install -> iwf_appsvcs_name
112111
}
113112
}

docs/class1/module3/lab1.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 3.1: iWorkflow Onboarding
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module3/lab2.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 3.2: Create a Declarative Service Catalog
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module3/lab3.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 3.3: Deploy L4-7 Services
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module3/lab4.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Lab 3.4: iWorkflow REST Proxy
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

docs/class1/module3/module3.rst

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Module 3: Creating Declarative Service Interfaces with iWorkflow
77
rankdir="LR"
88
ranksep=.4
99
node [fontsize=10,style="rounded,filled",shape=box,color=gray72,margin="0.05,0.05",height=0.1]
10-
fontname = "arial-bold"
1110
fontsize = 10
1211
labeljust="l"
1312
subgraph cluster_provider {

0 commit comments

Comments
 (0)