use new infra

cs3org · Jan 18, 2021 · f4a2292 · f4a2292
1 parent 20981e6
commit f4a2292
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/examples/metrics/xcloud.toml b/examples/metrics/xcloud.toml
@@ -6,7 +6,7 @@ metrics_data_driver_type = "xcloud"
 metrics_record_interval = 5000
 xcloud_instance="http://localhost"
 xcloud_interval=5
-xcloud_catalog='https://sciencemesh-test.uni-muenster.de/api/mentix/?action=register'
+xcloud_catalog='https://sciencemesh-test.uni-muenster.de/api/mentix/sites?action=register'
 
 [http.services.prometheus]
 
diff --git a/pkg/metrics/driver/xcloud/xcloud.go b/pkg/metrics/driver/xcloud/xcloud.go
@@ -155,6 +155,13 @@ func (d *CloudDriver) refresh() error {
 	defer resp.Body.Close()
 	body, _ := ioutil.ReadAll(resp.Body)
 
+	if resp.StatusCode != http.StatusOK {
+		err := fmt.Errorf("xcloud: error registering site: status code(%d) body(%s)", resp.StatusCode, string(body))
+		log.Err(err).Msg("xcloud: error registering site")
+		return err
+	}
+
+
 	log.Info().Msgf("xcloud: site registered: %s", string(body))
 
 	return nil
@@ -216,9 +223,9 @@ type CloudData struct {
 
 // CloudDataMetrics reprents the metrics gathered from the sciencemesh app
 type CloudDataMetrics struct {
-	TotalUsers   int64 `json:"total_users"`
-	TotalGroups  int64 `json:"total_groups"`
-	TotalStorage int64 `json:"total_storage"`
+	TotalUsers   int64 `json:"numusers"`
+	TotalGroups  int64 `json:"numgroups"`
+	TotalStorage int64 `json:"numstorage"`
 }
 
 // CloudDataSettings represents the metrics gathered