[dolphinscheduler] branch dev updated (1edd2bd -> 2de4a3c)

[ki...@apache.org]

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

kirs pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git.


    from 1edd2bd  to #6957 implement interface deleteUpstreamRelation deleteDownstreamRelation  (#6966)
     add 2de4a3c  Add a demo docker-compose for testing the meter module (#6938)

No new revisions were added by this update.

Summary of changes:
 .../dolphinscheduler-alert-server/pom.xml          |  4 +++
 .../src/main/resources/application-alert.yaml      | 12 +++++++
 dolphinscheduler-api/pom.xml                       |  4 +++
 .../src/main/resources/application-api.yaml        |  9 ++++++
 dolphinscheduler-meter/pom.xml                     |  9 ++++++
 .../dolphinscheduler/meter/MeterConfiguration.java |  1 -
 .../src/main/resources/application-meter.yaml      | 27 ----------------
 .../grafana-demo/dashboards/provisioning.yaml      |  9 ++++--
 .../resources/grafana-demo/datasources/prom.yaml   |  8 +++--
 .../resources/grafana-demo}/docker-compose.yaml    | 37 ++++++++++++++--------
 .../src/main/resources/grafana-demo/prometheus.yml | 17 ++++++++--
 dolphinscheduler-server/pom.xml                    |  4 +++
 .../server/master/MasterServer.java                |  6 +---
 .../server/worker/WorkerServer.java                |  2 --
 .../src/main/resources/application-master.yaml     | 12 +++++++
 .../src/main/resources/application-worker.yaml     | 12 +++++++
 .../src/main/resources/application-standalone.yaml | 14 ++++++++
 script/dolphinscheduler-daemon.sh                  |  3 --
 18 files changed, 129 insertions(+), 61 deletions(-)
 delete mode 100644 dolphinscheduler-meter/src/main/resources/application-meter.yaml
 copy ambari_plugin/common-services/DOLPHIN/1.3.0/package/templates/application-api.properties.j2 => dolphinscheduler-meter/src/main/resources/grafana-demo/dashboards/provisioning.yaml (87%)
 copy ambari_plugin/common-services/DOLPHIN/1.3.0/package/templates/application-api.properties.j2 => dolphinscheduler-meter/src/main/resources/grafana-demo/datasources/prom.yaml (89%)
 copy {dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/resources/docker/tenant => dolphinscheduler-meter/src/main/resources/grafana-demo}/docker-compose.yaml (57%)
 copy ambari_plugin/common-services/DOLPHIN/1.3.0/package/templates/application-api.properties.j2 => dolphinscheduler-meter/src/main/resources/grafana-demo/prometheus.yml (54%)