From c87267246eca3a97055364896f73990713cadc71 Mon Sep 17 00:00:00 2001
From: Patrick Carney <patrick.s.carney@gmail.com>
Date: Fri, 27 Jul 2018 16:49:29 +0200
Subject: [PATCH] Merge branch 'master' of github.com:rht-labs/enablement-docs into java-github-pics

---
 exercises/6-return-of-the-app-monitoring/README.md |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/exercises/6-return-of-the-app-monitoring/README.md b/exercises/6-return-of-the-app-monitoring/README.md
index d40a5f6..1cb21d3 100644
--- a/exercises/6-return-of-the-app-monitoring/README.md
+++ b/exercises/6-return-of-the-app-monitoring/README.md
@@ -32,12 +32,14 @@
 1. [Pipeline Aggregator View](https://wiki.jenkins.io/display/JENKINS/Pipeline+Aggregator+View) - Allows the users to view the history of their pipelines with stage information (failed/In Progress/Passed) and the changes monitored)
 
 ## Big Picture
-This exercise begins cluster containing blah blah
+> From the previous exercise; we introduced non-functional testing to our pipeline. This exercise focuses on radiation of useful information such as build stats and times from our pipeline. 
+
+![big-picture](../images/big-picture/big-picture-5.jpg)
 
 _____
 
 ## 10,000 Ft View
-> The goal of this exercise is to introduce Build Monitors to radiate teams progress on Dashboards.
+> The goal of this exercise is to introduce Build Monitors to radiate team's progress on Dashboards.
 
 2. Create a new Dashboard for our Builds using the plugin above. Use Regex to add jobs to it. Use the BuildFail Analyser to add meaningful data to the reason for failures.
 
@@ -60,7 +62,7 @@
 2. Check the box to use Regular Expression and set the value to be something that should scrape our apps such as `.*todolist.*` 
 ![config-regex](../images/exercise6/config-regex.png)
 
-2. Finally; select `Display committers` and set the Failure Analyser to `Description`. This allows us to write regex for when fails occur in Jenkins and have the reasons plotted on the graph. For example; number of test scores or common compilation errors. 
+2. Finally; select `Display committers` and set the Failure Analyser to `Description`. This allows us to write regexes for when failures occur in Jenkins and have the reasons plotted on the graph. For example; number of test scores or common compilation errors. 
 ![config-commiters](../images/exercise6/config-commiters.png)
 
 2. Save your configuration to see your Build Monitor! 
@@ -121,7 +123,7 @@
 ```
 ![fail-dashboard](../images/exercise6/fail-dashboard.png)
 
-2. We can save up these regex and inject them into the `jenkins-s2i` so the configuration is there the next time we launch and we don't have to code them up again. In `enablement-ci-cd` repo; the `jenkins-s2i/configuration/build-failure-analyzer.xml` already contains ones we've collected on previous residencies.
+2. We can save up these regexes and inject them into the `jenkins-s2i` so the configuration is there the next time we launch and we don't have to code them up again. In `enablement-ci-cd` repo; the `jenkins-s2i/configuration/build-failure-analyzer.xml` already contains ones we've collected on previous residencies.
 
 ### Part 3 - Seed Jenkins Dashboards
 > _TODO - Add instructions for creating dashboards as part of s2i in Jenkins setup using DSL_
@@ -137,7 +139,7 @@
  - Add `Slack` integration to the Pipeline by setting up a WebHook to call the slack endpoint with Build Stats
  - Add `Twillio` text integration to send you text messages when the build fails.
 Additional Monitoring
- - Explore the Application's FEK stack inside OpenShift
+ - Explore the Application's EFK stack inside OpenShift
 
 ## Additional Reading
 > List of links or other reading that might be of use / reference for the exercise

--
Gitblit v1.9.3