Update readme with selective labels/filters/expressions

Author: Matthew Coleman

README.md

@@ -90,11 +90,8 @@ shui \
     --display 3 \
     --labels "NVME Used Space" \
     --query 'df -h | grep nvme0n1p2 | awk '\''{print $3}'\'''
-```
-
-You can also execute Shui from standard input, which works like query mode.
 
-```sh
+# You can also execute Shui from standard input, which works like query mode.
 while true; do uptime; sleep 1; done | shui
 ```
 
@@ -113,7 +110,21 @@ See [example/shui.toml](example/shui.toml) for an example.
 > NOTE: Most options may be mixed, but queries and expressions may only be supplied with either
 > flags or configuration and not both.
 
-### Persistence
+### Manipulating Results
+
+There are ways to play with the results of queries.
+
+- **Labels** are ways to name a stream of data. Query outputs are expected to be space delimited
+  information, like a log. Labels allow keyword indexing of these results, creating an untyped
+  schema. By default, information will be labelled with rumerically indexed.
+
+- **Filters** allow output to be selected for specific labels. This is necessary for some display
+  modes.
+
+- **Expressions** allow transformation of results based on a expression statement. This is
+  [explained more below](#expressions).
+
+### Presisting Results
 
 Shui, by default, will store results and load them when re-executing the same query.
 
@@ -143,11 +154,11 @@ Some examples:
 ```sh
 # Multiply the 5m CPU average by 10. Note that we invoke `get` with a key of `"9"` because default
 # labels are string indexes and no labels were provided.
-shui --query 'uptime | tr -d ","' -expr 'get(result, "9") * 10'
+shui --query 'uptime | tr -d ","' --expr 'get(result, "9") * 10'
 
 # Cumulatively sum 5m CPU average. Note that we need to account for prevResult being empty and we
 # must convert the prevResult from a string to a float.
-shui --query 'uptime | tr -d ","' -filters 9 -expr 'get(result, "0") + ("0" in prevResult? float(get(prevResult, "0")) : 0)'
+shui --query 'uptime | tr -d ","' --filters 9 -expr 'get(result, "0") + ("0" in prevResult? float(get(prevResult, "0")) : 0)'
 ```
 
 See: <https://expr-lang.org/docs/language-definition>
@@ -165,8 +176,8 @@ Shui can create Elasticsearch documents from results.
 shui \
     --elasticsearch-addr <addr> \
     --elasticsearch-index <index> \
-    --elasticsearch-user <user> \
-    --elasticsearch-password <password
+    --elasticsearch-password <password \
+    --elasticsearch-user <user>
 ```
 
 - Documents are structured according to result labels supplied with `--labels`, prefixed with

cmd/shui/main.go

@@ -83,12 +83,12 @@ var (
 		"elasticsearch.index":    "elasticsearch-index",
 		"elasticsearch.password": "elasticsearch-password",
 		"elasticsearch.user":     "elasticsearch-user",
+		"prometheus.exporter":    "prometheus-exporter",
+		"prometheus.pushgateway": "prometheus-pushgateway",
 		"tui.padding.bottom":     "outer-padding-bottom",
 		"tui.padding.left":       "outer-padding-left",
 		"tui.padding.right":      "outer-padding-right",
 		"tui.padding.top":        "outer-padding-top",
-		"prometheus.exporter":    "prometheus-exporter",
-		"prometheus.pushgateway": "prometheus-pushgateway",
 		"tui.show.help":          "show-help",
 		"tui.show.logs":          "show-logs",
 		"tui.show.status":        "show-status",