Merge branch 'extraPorts' of github.com:billimek/loki into extraPorts

* 'extraPorts' of github.com:billimek/loki: (25 commits)
  Ensure status codes are set correctly in the frontend. (grafana#1684)
  --dry-run Promtail. (grafana#1652)
  Fix logcli --quiet parameter parsing issue (grafana#1682)
  This improves the log ouput for statistics in the logcli. (grafana#1644)
  Loki stack helm chart can deploy datasources without Grafana (grafana#1688)
  Automatically prune metrics from the /metrics output of the promtail metrics pipeline stage after an idle period.
  Allow a metric defined as a counter to match all lines, useful for creating line count metrics which include all your labels. Found a bug in the the test runner where it didn't fail if the actual error was nil but the test expected an error Added some tests to the counters to test valid configs
  maintainer links & usernames (grafana#1675)
  Binary operators in LogQL (grafana#1662)
  Pipe data to Promtail (grafana#1649)
  Add Owen to the maintainer team. (grafana#1673)
  Update tanka.md so that promtail.yml is in the correct format (grafana#1671)
  Correcte syntax of rate example (grafana#1641)
  Frontend & Querier query statistics instrumentation. (grafana#1661)
  loki-canary: fix indent of DaemonSet manifest written in .md file (grafana#1648)
  Query frontend service should be headless. (grafana#1665)
  Support custom prefix name in metrics stage (grafana#1664)
  pkg/promtail/positions: handle empty positions file (grafana#1660)
  Convert second(Integer class) to nanosecond precision (grafana#1656)
  Unite docs for fluentd plugin (grafana#1634)
  ...

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Features
 
+* [1662](https://github.com/grafana/loki/pull/1662) **owen-d**: Introduces binary operators in LogQL
 * [1572](https://github.com/grafana/loki/pull/1572) **owen-d**: Introduces the `querier.query-ingesters-within` flag and associated yaml config. When enabled, queries for a time range that do not overlap this lookback interval will not be sent to the ingesters.
 * [1558](https://github.com/grafana/loki/pull/1558) **owen-d**: Introduces `ingester.max-chunk-age` which specifies the maximum chunk age before it's cut.
 * [1565](https://github.com/grafana/loki/pull/1565) **owen-d**: The query frontend's `split_queries_by_interval` can now be specified as an override

cmd/logcli/main.go

@@ -148,7 +148,7 @@ func newQuery(instant bool, cmd *kingpin.CmdClause) *query.Query {
 			query.Start = mustParse(from, defaultStart)
 			query.End = mustParse(to, defaultEnd)
 		}
-
+		query.Quiet = *quiet
 		return nil
 	})
 

cmd/promtail/main.go

@@ -27,6 +27,7 @@ func init() {
 
 func main() {
 	printVersion := flag.Bool("version", false, "Print this builds version information")
+	dryRun := flag.Bool("dry-run", false, "Start Promtail but print entries instead of sending them to Loki.")
 
 	// Load config, merging config file and CLI flags
 	var config config.Config
@@ -57,18 +58,17 @@ func main() {
 		stages.Debug = true
 	}
 
-	p, err := promtail.New(config)
+	p, err := promtail.New(config, *dryRun)
 	if err != nil {
 		level.Error(util.Logger).Log("msg", "error creating promtail", "error", err)
 		os.Exit(1)
 	}
 
 	level.Info(util.Logger).Log("msg", "Starting Promtail", "version", version.Info())
+	defer p.Shutdown()
 
 	if err := p.Run(); err != nil {
 		level.Error(util.Logger).Log("msg", "error starting promtail", "error", err)
 		os.Exit(1)
 	}
-
-	p.Shutdown()
 }

codecov.yml

@@ -9,7 +9,9 @@ coverage:
     project:
       default:
         informational: true
-
+    patch:
+      default:
+        informational: true
 
 parsers:
   gcov:

docs/clients/README.md

@@ -4,8 +4,8 @@ Loki supports the following official clients for sending logs:
 
 1. [Promtail](./promtail/README.md)
 2. [Docker Driver](./docker-driver/README.md)
+3. [Fluentd](./fluentd/README.md)
 4. [Fluent Bit](../../cmd/fluent-bit/README.md)
-3. [Fluentd](./fluentd.md)
 
 ## Picking a Client