From: Lenz Grimmer <lgrimmer@suse.com>
Date: Mon, 25 May 2020 11:39:55 +0000 (+0200)
Subject: Merge pull request #34953 from s0nea/wip-dashboard-telemetry-url
X-Git-Tag: v16.1.0~2248
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2069d58e4366cc67538bdc95d91a02a20f1f983e;p=ceph.git

Merge pull request #34953 from s0nea/wip-dashboard-telemetry-url

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
---

2069d58e4366cc67538bdc95d91a02a20f1f983e
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts
index 251c27b75bd,d9ec0e4f8ec..b3282e1b5d5
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts
@@@ -60,15 -66,18 +62,18 @@@ export class TelemetryComponent extend
      ];
      observableForkJoin(observables).subscribe(
        (resp: object) => {
-         this.moduleEnabled = resp[1]['enabled'];
+         const configResp = resp[1];
+         this.moduleEnabled = configResp['enabled'];
+         this.sendToUrl = configResp['url'];
+         this.sendToDeviceUrl = configResp['device_url'];
          this.options = _.pick(resp[0], this.requiredFields);
-         const configs = _.pick(resp[1], this.requiredFields);
+         const configs = _.pick(configResp, this.requiredFields);
          this.createConfigForm();
          this.configForm.setValue(configs);
 -        this.loading = false;
 +        this.loadingReady();
        },
        (_error) => {
 -        this.error = true;
 +        this.loadingError();
        }
      );
    }