Add fixes for ansible

BBVA · Mar 1, 2019 · 2aca257 · 2aca257
1 parent 712d488
commit 2aca257
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/balloon/balloon.go b/balloon/balloon.go
@@ -294,12 +294,6 @@ func (b Balloon) QueryDigestMembership(keyDigest hashing.Digest, version uint64)
 func (b Balloon) QueryMembership(event []byte, version uint64) (*MembershipProof, error) {
 	hasher := b.hasherF()
 
-	// Metrics
-	metrics.QedBalloonMembershipTotal.Inc()
-	metrics.QedBalloonDigestMembershipTotal.Dec()
-	//timer := prometheus.NewTimer(metrics.QedBalloonMembershipDurationSeconds)
-	//defer timer.ObserveDuration()
-
 	return b.QueryDigestMembership(hasher.Do(event), version)
 }
 

diff --git a/deploy/aws/provision/files/grafana/dashboards/QED.json b/deploy/aws/provision/files/grafana/dashboards/QED.json
@@ -294,7 +294,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(qed_balloon_membership_total) + sum(qed_balloon_digest_membership_total)",
+          "expr": "sum(qed_balloon_digest_membership_total)",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"
@@ -525,19 +525,12 @@
       "stack": true,
       "steppedLine": false,
       "targets": [
-        {
-          "expr": "sum(rate(qed_balloon_membership_total[$interval])) by (job)",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "{{job}}-memb",
-          "refId": "A"
-        },
         {
           "expr": "sum(rate(qed_balloon_digest_membership_total[$interval])) by (job)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{job}}-digest_memb",
-          "refId": "B"
+          "refId": "A"
         }
       ],
       "thresholds": [],

diff --git a/deploy/aws/provision/main.yml b/deploy/aws/provision/main.yml
@@ -28,6 +28,9 @@
   remote_user: ec2-user
   become: true
   tasks:
+    - name: Wait 300 seconds for port 22 to become open and contain "OpenSSH"
+      wait_for:
+        port: 22
     - name: Gather facts
       setup:
 
@@ -74,16 +77,30 @@
 
 - hosts: role_qed
   remote_user: ec2-user
+  serial: 1
   become: true
   vars_files:
     - vars.yml
   tasks:
     - name: Start all services
-      shell: > 
+      shell: >
         {{ item }}
       with_items:
         - /var/qed/qed-start.sh
         - /var/qed/exporter-start.sh
+    - name: wait for raised api port
+      wait_for:
+        port: 8800
+    - name: wait for raised mgmt port
+      wait_for:
+        port: 8700
+    - name: wait for raised metrics port
+      wait_for:
+        port: 8600
+    - name: wait for raised raft port
+      wait_for:
+        port: 8500
+
   tags:
     - start-qed