Skip to content

Various AutoCon2 workshop fixes #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrmrcoleman wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Various AutoCon2 workshop fixes #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion autocon2-workshop/5_start_icinga.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ echo
echo "--- Cloning Icinga2 ---"
echo

git clone -b master https://github.com/davekempe/icinga2-docker-stack.git
git clone https://github.com/davekempe/icinga2-docker-stack.git
pushd icinga2-docker-stack
git checkout 6050178 # Pin to Nov 2024 commit when workshop was developed

echo
echo "--- Writing configuration ---"
Expand All @@ -37,6 +38,9 @@ sed -i 's/8080:80/${ICINGA_PORT}:80/' docker-compose.yml
sed -i 's/^ *#- ICINGAWEB2_ADMIN_USER=icingaadmin/ - ICINGAWEB2_ADMIN_USER=icingaadmin/' docker-compose.yml
sed -i 's/^ *#- ICINGAWEB2_ADMIN_PASS=icinga/ - ICINGAWEB2_ADMIN_PASS=icinga/' docker-compose.yml

# Pin docker image to Nov 2024 version
sed -i 's|image: sol1/icinga2-stack|image: sol1/icinga2-stack@sha256:cd0b54604c30c05f2fea16abdf7c2947e1556f3a6a22f0406f00c2997e6f17ac|' docker-compose.yml

echo
echo "--- Starting Icinga2 ---"
echo
Expand Down
2 changes: 1 addition & 1 deletion autocon2-workshop/docs/4_Discovery_Reconciliation_Slurpit.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ ___

### Use Slurpit to discover additional device data

With Slurpit, pulling discovered network data into Netbox happens in two stages. The first step, which we just did, is to onboard the devices. The second step is to `Reconcile` the additional data about the devices into NetBox, but first we need to discover that additional device data using Slurpit.
With Slurpit, pulling discovered network data into Netbox happens in two stages. The first step, which we just did, is to onboard the devices. The second step is to `Reconcile` the additional data about the devices into NetBox, but first we need to discover that additional device data using Slurpit.

> [!TIP]
> **Slurpit URL**: `./0_set_envvars.sh | grep -i slurpit`
Expand Down
2 changes: 1 addition & 1 deletion autocon2-workshop/docs/Installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

```
git clone https://github.com/netboxlabs/netbox-learning.git
cd netbox-learning/automation-zero-to-hero
cd netbox-learning/autocon2-workshop
```

## Set environment variables
Expand Down
2 changes: 1 addition & 1 deletion autocon2-workshop/netpicker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ services:
- autocon-workshop

frontend:
image: netpicker/frontend@sha256:93b8f3d5182a2bbd6ece7bac0c08d6a5471c7658271513f87784661139ff75e8
image: netpicker/tester-frontend:2.3.9 # frontend was removed from Docker Hub
container_name: frontend
labels:
service.netpicker.io: front-end
Expand Down