Skip to content

Commit

Permalink
Fixed YAML files links to main repo
Browse files Browse the repository at this point in the history
  • Loading branch information
ppatierno authored and mbogoevici committed Apr 9, 2019
1 parent b627d7c commit cc41a94
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions labs/0-to-60.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ You have just deployed the cluster operator.

It is time to start an Apache Kafka cluster.
We will create now the most basic cluster possible.
The configuration file is https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/simple-cluster.yaml[here].
The configuration file is https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/simple-cluster.yaml[here].
You can open it - it looks like this:

----
Expand Down Expand Up @@ -158,7 +158,7 @@ spec:

Now let's create the cluster by deploying this new custom resource:
----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/simple-cluster.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/simple-cluster.yaml
----

Again, follow the deployment from the OpenShift console.
Expand Down
6 changes: 3 additions & 3 deletions labs/clients-within-outside-OCP.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
Now let's apply this configuration to the running cluster.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready-external-routes.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready-external-routes.yaml
----

Now you can inspect the existing services.
Expand All @@ -70,8 +70,8 @@ We can now run our producer and consumer applications by using this certificate.
Let's download the two JARs.

----
wget -O log-consumer.jar https://github.com/mbogoevici/workshop-amq-streams/blob/master/bin/log-consumer.jar?raw=true
wget -O timer-producer.jar https://github.com/mbogoevici/workshop-amq-streams/blob/master/bin/timer-producer.jar?raw=true
wget -O log-consumer.jar https://github.com/RedHatWorkshops/workshop-amq-streams/blob/master/bin/log-consumer.jar?raw=true
wget -O timer-producer.jar https://github.com/RedHatWorkshops/workshop-amq-streams/blob/master/bin/timer-producer.jar?raw=true
----

Let's launch the two applications with new configuration settings (replace <GUID> with your workstation GUID):
Expand Down
4 changes: 2 additions & 2 deletions labs/kafka-connect.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

We will start by deploying a KafkaConnect cluster.

The configuration file for creating a KafkaConnect cluster named `connect-cluster` is https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/kafka-connect.yaml[here].
The configuration file for creating a KafkaConnect cluster named `connect-cluster` is https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/kafka-connect.yaml[here].
Now let's apply it.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/kafka-connect.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/kafka-connect.yaml
----

Watch for the creation of the KafkaConnect cluster.
Expand Down
6 changes: 3 additions & 3 deletions labs/management-monitoring.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ In this case it is 'amq-streams'.
We will reconfigure the `production-ready` cluster to advertise metrics.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready-monitored.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready-monitored.yaml
----

=== Installing Prometheus

To install Prometheus, we use the instructions of the Strimzi labs: https://strimzi.io/docs/0.11.1/#kafka_metrics_configuration

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/metrics/prometheus.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/metrics/prometheus.yaml
----

Then we create a route for the Prometheus service.
Expand All @@ -36,7 +36,7 @@ oc expose svc prometheus
=== Install Grafana

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/metrics/grafana.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/metrics/grafana.yaml
----

Then we create a route for the Grafana service.
Expand Down
10 changes: 5 additions & 5 deletions labs/mirror-maker.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ oc project amq-streams
----

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/timer-producer-team-1.yaml
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/log-consumer-team-2.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/timer-producer-team-1.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/log-consumer-team-2.yaml
----

Now the `log-consumer` application consumes data from cluster `test-2`, while `timer-producer` sends data to cluster `test-1`.
If we look at `log-consumer`s output, we will see that no data is received.

We can confirm that pointing the application to the cluster `test-1` will yield data.
----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/log-consumer-team-1.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/log-consumer-team-1.yaml
----

=== Setting up the source and target clusters
Expand All @@ -47,7 +47,7 @@ oc project amq-streams
Now let's deploy MirrorMaker.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/mirror-maker.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/mirror-maker.yaml
----

The notions of producer and consumer are from MirrorMaker's perspective.
Expand All @@ -68,7 +68,7 @@ This will confirm that the replicated topic `lines` was created automatically.
Now let's deploy `log-consumer` against the cluster in `test-2`:

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/log-consumer-team-2.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/log-consumer-team-2.yaml
----

Logging the pod again should yield the expected results and data flows between systems.
10 changes: 5 additions & 5 deletions labs/production-ready-topologies.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ spec:
Let's deploy this new resource.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready.yaml
----

The cluster `production-ready` has the minimal settings for a highly available, persistent cluster.
Expand Down Expand Up @@ -163,14 +163,14 @@ Notice the only change being the number of nodes.
Let's apply this new configuration:

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready-5-nodes.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready-5-nodes.yaml
----

Notice the number of pods of the Kafka cluster increasing to 5 and the corresponding persistent claims.
Now let's scale down the cluster again.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready.yaml
----

Notice the number of pods of the Kafka cluster decreasing back to 3.
Expand All @@ -179,7 +179,7 @@ What does this mean?
Let's scale up the cluster again.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready-5-nodes.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready-5-nodes.yaml
----

Notice the number of pods increasing back to 5 and the corresponding persistent volume claims being reallocated to the existing nodes.
Expand All @@ -188,5 +188,5 @@ This means that the newly started instances will resume from where the previous
Three broker nodes will be sufficient for our lab, so we can scale things down again:

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready.yaml
----
14 changes: 7 additions & 7 deletions labs/security.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ EOF
Let's deploy the new configuration:

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready-secured.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready-secured.yaml
----

Watch for the changes in the stateful set.
Expand Down Expand Up @@ -94,7 +94,7 @@ spec:
Let's apply this new configuration.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/users/secure-topic-reader.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/users/secure-topic-reader.yaml
----

The newly created user can read the metadata of topic `lines` and consume (read) from it with the consumer group `lines`.
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:

And let's apply this new configuration.
----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/users/secure-topic-writer.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/users/secure-topic-writer.yaml
----

Go to `Secrets` and observe that new secret named `secure-topic-reader` and `secure-topic-writer` have been created.
Expand All @@ -135,8 +135,8 @@ Both secrets have a field named `password`.
Now let's redeploy our running applications.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/timer-producer.yaml
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/log-consumer.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/timer-producer.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/log-consumer.yaml
----

Looking at the logs, we see a lot of errors - the clients cannot connect anymore.
Expand Down Expand Up @@ -181,7 +181,7 @@ spec:
Now let's deploy this new configuration.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/timer-producer-secured.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/timer-producer-secured.yaml
----

We need to secure the `log-consumer` application as well:
Expand Down Expand Up @@ -227,7 +227,7 @@ spec:
Let's apply this new configuration:

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/log-consumer-secured.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/log-consumer-secured.yaml
----

Inspect the log of `log-consumer` again.
Expand Down
4 changes: 2 additions & 2 deletions labs/topic-management.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Notice a few important attributes:
Now let's deploy the `KafkaTopic` into our current project:

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/topics/lines.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/topics/lines.yaml
----

Let's wait a number of seconds and let's try to check that the topic has been created and log into one of the Kafka pods.
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:

Next, we will apply the new configuration.
----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/topics/lines-10.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/topics/lines-10.yaml
----

And let's get the topic information again.
Expand Down
4 changes: 2 additions & 2 deletions labs/understanding-the-application-ecosystem.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
Next, we deploy the application.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/timer-producer.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/timer-producer.yaml
----


Expand Down Expand Up @@ -71,7 +71,7 @@ spec:
Now, let's deploy the message consumer.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/log-consumer.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/log-consumer.yaml
----

Make sure that everything works and all the applications are started, then we will validate that the applications communicate with each other.
Expand Down
12 changes: 6 additions & 6 deletions labs/watching-multiple-namespaces.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Use the console to monitor the result.

Let's deploy
----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready.yaml -n team-1
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready.yaml -n team-1
----

From the OpenShift console, navigate to the `team-1` project and notice the new cluster, as well as service.
Expand All @@ -153,8 +153,8 @@ Let's see that the cluster works.
Reconfigure the `timer-producer` and `log-consumer` applications to use the new cluster.

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/log-consumer-team-1.yaml
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/applications/timer-producer-team-1.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/log-consumer-team-1.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/applications/timer-producer-team-1.yaml
----

Once the applications have restarted, navigate to the logs and you should see the messages flowing again.
Expand Down Expand Up @@ -214,7 +214,7 @@ oc login -u dev-team-2 master00.example.com
Change the cluster configuration:

----
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready.yaml
----

You should see the operation failing with an error along the lines of `Error from server (Forbidden):`.
Expand All @@ -225,7 +225,7 @@ Log in as `admin` and apply the roles.

----
oc login -u admin master00.example.com
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/users/strimzi-admin.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/users/strimzi-admin.yaml
----

Assign the cluster role to the newly created users.
Expand All @@ -238,7 +238,7 @@ Now log in again try to repeat the operation.

----
oc login -u dev-team-2 master00.example.com
oc apply -f https://raw.githubusercontent.com/mbogoevici/workshop-amq-streams/master/configurations/clusters/production-ready.yaml
oc apply -f https://raw.githubusercontent.com/RedHatWorkshops/workshop-amq-streams/master/configurations/clusters/production-ready.yaml
----

You should see the new cluster being created.

0 comments on commit cc41a94

Please sign in to comment.