Advertisement
Guest User

Untitled

a guest
Nov 12th, 2018
239
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.43 KB | None | 0 0
  1. diff -u content/docs/1.7/architecture.md content/docs/1.8/architecture.md
  2. --- content/docs/1.7/architecture.md    2018-11-12 17:13:26.231591472 +0100
  3. +++ content/docs/1.8/architecture.md    2018-11-12 18:38:52.581511715 +0100
  4. @@ -48,3 +48,7 @@
  5.  ### Query
  6.  
  7.  {{< definition "query" >}}
  8. +
  9. +### Ingester
  10. +
  11. +{{< definition "ingester" >}}
  12. diff -u content/docs/1.7/deployment.md content/docs/1.8/deployment.md
  13. --- content/docs/1.7/deployment.md  2018-11-12 20:47:26.523081469 +0100
  14. +++ content/docs/1.8/deployment.md  2018-11-12 18:52:50.772282059 +0100
  15. @@ -10,6 +10,7 @@
  16.  **jaeger-agent**      | [hub.docker.com/r/jaegertracing/jaeger-agent/](https://hub.docker.com/r/jaegertracing/jaeger-agent/)
  17.  **jaeger-collector**  | [hub.docker.com/r/jaegertracing/jaeger-collector/](https://hub.docker.com/r/jaegertracing/jaeger-collector/)
  18.  **jaeger-query**      | [hub.docker.com/r/jaegertracing/jaeger-query/](https://hub.docker.com/r/jaegertracing/jaeger-query/)
  19. +**jaeger-ingester**   | [hub.docker.com/r/jaegertracing/jaeger-ingester/](https://hub.docker.com/r/jaegertracing/jaeger-ingester/)
  20.  
  21.  There are orchestration templates for running Jaeger with:
  22.  
  23. @@ -26,7 +27,7 @@
  24.  
  25.  To see the complete list of options, run the binary with `help` command. Options that are specific to a certain storage backend are only listed if the storage type is selected. For example, to see all available options in the Collector with Cassandra storage:
  26.  
  27. -```
  28. +```sh
  29.  $ docker run --rm \
  30.      -e SPAN_STORAGE_TYPE=cassandra \
  31.      jaegertracing/jaeger-collector:{{< currentVersion >}} \
  32. @@ -54,7 +55,7 @@
  33.  
  34.  It can be executed directly on the host or via Docker, as follows:
  35.  
  36. -```bash
  37. +```sh
  38.  ## make sure to expose only the ports you use in your deployment scenario!
  39.  docker run \
  40.    --rm \
  41. @@ -73,7 +74,7 @@
  42.  
  43.  On Docker, a command like the following can be used:
  44.  
  45. -```bash
  46. +```sh
  47.  docker run \
  48.    --rm \
  49.    -p5775:5775/udp \
  50. @@ -81,7 +82,7 @@
  51.    -p6832:6832/udp \
  52.    -p5778:5778/tcp \
  53.    jaegertracing/jaeger-agent:{{< currentVersion >}} \
  54. -  --collector.host-port=jaeger-collector.jaeger-infra.svc:14267
  55. +  --reporter.tchannel.collector.host-port=jaeger-collector.jaeger-infra.svc:14267
  56.  ```
  57.  
  58.  In the future we will support different service discovery systems to dynamically load balance
  59. @@ -94,13 +95,13 @@
  60.  via `--cassandra.keyspace` and `--cassandra.servers` options, or the location of Elasticsearch cluster, via
  61.  `--es.server-urls`, depending on which storage is specified. To see all command line options run
  62.  
  63. -```
  64. +```sh
  65.  go run ./cmd/collector/main.go -h
  66.  ```
  67.  
  68.  or, if you don't have the source code
  69.  
  70. -```
  71. +```sh
  72.  docker run -it --rm jaegertracing/jaeger-collector:{{< currentVersion >}} -h
  73.  ```
  74.  
  75. @@ -175,7 +176,7 @@
  76.  your Cassandra cluster correctly. After verifying with e.g. `cqlsh`, you can
  77.  configure the collector and query like so:
  78.  
  79. -```
  80. +```sh
  81.  docker run \
  82.    -e CASSANDRA_SERVERS=<...> \
  83.    -e CASSANDRA_TLS=true \
  84. @@ -248,9 +249,7 @@
  85.  Supported in Jaeger since 1.6.0
  86.  Supported Kafka versions: 0.8+
  87.  
  88. -In version 1.6.0, the Kafka storage backend implementation only supports writing data, this means you will need to use another one (with the multiple storage types feature) to be able to view the traces in the Query component.
  89. -
  90. -Starting from version 1.7.0, a new component (Ingester) has been added to support reading from Kafka and storing it in another storage backend (Elasticsearch or Cassandra).
  91. +Starting from version 1.7.0, a new component [Ingester](#ingester) was added to support reading from Kafka and storing it in another storage backend (Elasticsearch or Cassandra).
  92.  
  93.  Writing to Kafka is particularly useful for building post-processing data pipelines.
  94.  
  95. @@ -278,6 +277,22 @@
  96.  
  97.  You can find more information about topics and partitions in general in the [official documentation](https://kafka.apache.org/documentation/#intro_topics). [This article](https://www.confluent.io/blog/how-to-choose-the-number-of-topicspartitions-in-a-kafka-cluster/) provide more details about how to choose the number of partitions.
  98.  
  99. +## Ingester
  100. +**jaeger-ingester** is a service which reads span data from Kafka topic and writes it to another storage backend (Elasticsearch or Cassandra).
  101. +
  102. +Port  | Protocol | Function
  103. +----- | -------  | ---
  104. +14270 | HTTP     | Health check at **/**
  105. +14271 | HTTP     | Metrics endpoint
  106. +
  107. +To view all exposed configuration options run the following command:
  108. +```sh
  109. +docker run \
  110. +  -e SPAN_STORAGE_TYPE=cassandra \
  111. +  jaegertracing/jaeger-ingester:{{< currentVersion >}}
  112. +  --help \
  113. +```
  114. +
  115.  ## Query Service & UI
  116.  
  117.  **jaeger-query** serves the API endpoints and a React/Javascript UI.
  118. diff -u content/docs/1.7/_index.md content/docs/1.8/_index.md
  119. --- content/docs/1.7/_index.md  2018-11-12 18:37:02.925732600 +0100
  120. +++ content/docs/1.8/_index.md  2018-11-12 18:37:02.943732564 +0100
  121. @@ -40,6 +40,7 @@
  122.    * Supported storage backends:
  123.      * [Cassandra 3.4+](./deployment/#cassandra)
  124.      * [Elasticsearch 5.x, 6.x](./deployment/#elasticsearch)
  125. +    * [Kafka](./deployment/#kafka)
  126.      * memory storage
  127.  
  128.  ## Quick Start
  129. diff -u content/docs/1.7/monitoring.md content/docs/1.8/monitoring.md
  130. --- content/docs/1.7/monitoring.md  2018-11-12 17:13:26.232591472 +0100
  131. +++ content/docs/1.8/monitoring.md  2018-11-12 18:20:25.973220804 +0100
  132. @@ -20,6 +20,7 @@
  133.  **jaeger-agent**      | 5778
  134.  **jaeger-collector**  | 14268
  135.  **jaeger-query**      | 16686
  136. +**jaeger-ingester**   | 14271
  137.  
  138.  ## Logging
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement