You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by lu...@apache.org on 2023/04/20 10:54:50 UTC

[skywalking] branch banyandb-topn updated (e6df350b9a -> 1723836d4a)

This is an automated email from the ASF dual-hosted git repository.

lujiajing pushed a change to branch banyandb-topn
in repository https://gitbox.apache.org/repos/asf/skywalking.git


    from e6df350b9a fix log
     add cce87a9917 Support Elasticsearch monitoring (#10690)
     add 1723836d4a Merge branch 'master' into banyandb-topn

No new revisions were added by this update.

Summary of changes:
 .github/workflows/skywalking.yaml                  |    2 +
 docs/en/changes/changes.md                         |    1 +
 .../backend/backend-elasticsearch-monitoring.md    |  115 ++
 docs/menu.yml                                      |    2 +
 .../skywalking/oap/server/core/analysis/Layer.java |    8 +-
 .../ui/template/UITemplateInitializer.java         |    1 +
 .../src/main/resources/application.yml             |    3 +-
 .../elasticsearch/elasticsearch-cluster.yaml       |   72 ++
 .../elasticsearch/elasticsearch-index.yaml         |  127 +++
 .../elasticsearch/elasticsearch-node.yaml          |  149 +++
 .../elasticsearch/elasticsearch-cluster.json       |  454 ++++++++
 .../elasticsearch/elasticsearch-index.json         |  796 ++++++++++++++
 .../elasticsearch/elasticsearch-node.json          | 1132 ++++++++++++++++++++
 .../elasticsearch-root.json}                       |   42 +-
 .../{promql => elasticsearch}/docker-compose.yml   |   92 +-
 .../redis-exporter => elasticsearch}/e2e.yaml      |    5 +-
 .../cases/elasticsearch/elasticsearch-cases.yaml   |  219 ++++
 .../e2e-v2/cases/elasticsearch/es-e2e-data-mock.sh |   81 ++
 .../eks => elasticsearch}/expected/endpoint.yml    |    4 +-
 .../expected/instance.yml}                         |    4 +-
 .../expected/metrics-has-value-label.yml           |    6 +-
 .../expected/metrics-has-value.yml}                |    6 +-
 .../{alarm => elasticsearch}/expected/service.yml  |   14 +-
 .../otel-collector-config.yaml                     |   26 +-
 .../script/prepare/setup-e2e-shell/install-yq.sh   |    2 +-
 25 files changed, 3275 insertions(+), 88 deletions(-)
 create mode 100644 docs/en/setup/backend/backend-elasticsearch-monitoring.md
 create mode 100644 oap-server/server-starter/src/main/resources/otel-rules/elasticsearch/elasticsearch-cluster.yaml
 create mode 100644 oap-server/server-starter/src/main/resources/otel-rules/elasticsearch/elasticsearch-index.yaml
 create mode 100644 oap-server/server-starter/src/main/resources/otel-rules/elasticsearch/elasticsearch-node.yaml
 create mode 100644 oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-cluster.json
 create mode 100644 oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-index.json
 create mode 100644 oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-node.json
 copy oap-server/server-starter/src/main/resources/ui-initialized-templates/{aws_dynamodb/aws_dynamodb-root.json => elasticsearch/elasticsearch-root.json} (67%)
 copy test/e2e-v2/cases/{promql => elasticsearch}/docker-compose.yml (56%)
 copy test/e2e-v2/cases/{redis/redis-exporter => elasticsearch}/e2e.yaml (94%)
 create mode 100644 test/e2e-v2/cases/elasticsearch/elasticsearch-cases.yaml
 create mode 100644 test/e2e-v2/cases/elasticsearch/es-e2e-data-mock.sh
 copy test/e2e-v2/cases/{aws/eks => elasticsearch}/expected/endpoint.yml (89%)
 copy test/e2e-v2/cases/{istio/metrics/expected/service-instance.yml => elasticsearch/expected/instance.yml} (96%)
 copy test/e2e-v2/cases/{postgresql => elasticsearch}/expected/metrics-has-value-label.yml (89%)
 copy test/e2e-v2/cases/{simple/expected/layer.yml => elasticsearch/expected/metrics-has-value.yml} (89%)
 copy test/e2e-v2/cases/{alarm => elasticsearch}/expected/service.yml (83%)
 copy test/e2e-v2/cases/{apisix/otel-collector => elasticsearch}/otel-collector-config.yaml (67%)