Merge and track latest features on stable #6
			
				
			
		
		
		
	| 
						 | 
					@ -151,8 +151,7 @@ curl -X PUT -H "Content-Type: application/json" -d "{
 | 
				
			||||||
  \"oldPassword\": \"admin\",
 | 
					  \"oldPassword\": \"admin\",
 | 
				
			||||||
  \"newPassword\": \"$GRAFANA_PASS\",
 | 
					  \"newPassword\": \"$GRAFANA_PASS\",
 | 
				
			||||||
  \"confirmNew\": \"$GRAFANA_PASS\"
 | 
					  \"confirmNew\": \"$GRAFANA_PASS\"
 | 
				
			||||||
}" http://admin:admin@localhost:3000/api/user/password
 | 
					}" http://admin:admin@localhost:3000/grafana/api/user/password
 | 
				
			||||||
read -n 1 -s -r -p "Press any key to continue..."$'\n'
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "
 | 
					echo "
 | 
				
			||||||
# Create InfluxDB datasource
 | 
					# Create InfluxDB datasource
 | 
				
			||||||
| 
						 | 
					@ -166,13 +165,12 @@ POST -H 'Content-Type: application/json;charset=UTF-8' -d \
 | 
				
			||||||
	"access":"proxy",
 | 
						"access":"proxy",
 | 
				
			||||||
	"isDefault":true,
 | 
						"isDefault":true,
 | 
				
			||||||
	"database":"jitsi"
 | 
						"database":"jitsi"
 | 
				
			||||||
}' http://admin:$GRAFANA_PASS@localhost:3000/api/datasources
 | 
					}' http://admin:$GRAFANA_PASS@localhost:3000/grafana/api/datasources
 | 
				
			||||||
read -n 1 -s -r -p "Press any key to continue..."$'\n'
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "
 | 
					echo "
 | 
				
			||||||
# Add Grafana Dashboard
 | 
					# Add Grafana Dashboard
 | 
				
			||||||
"
 | 
					"
 | 
				
			||||||
grafana_host="http://localhost:3000"
 | 
					grafana_host="http://localhost:3000/grafana"
 | 
				
			||||||
grafana_cred="admin:$GRAFANA_PASS"
 | 
					grafana_cred="admin:$GRAFANA_PASS"
 | 
				
			||||||
grafana_datasource="InfluxDB"
 | 
					grafana_datasource="InfluxDB"
 | 
				
			||||||
ds=(11969);
 | 
					ds=(11969);
 | 
				
			||||||
| 
						 | 
					@ -186,7 +184,6 @@ for d in "${ds[@]}"; do
 | 
				
			||||||
        \"pluginId\":\"influxdb\",\"value\":\"$grafana_datasource\"}]}" \
 | 
					        \"pluginId\":\"influxdb\",\"value\":\"$grafana_datasource\"}]}" \
 | 
				
			||||||
    $grafana_host/api/dashboards/import; echo ""
 | 
					    $grafana_host/api/dashboards/import; echo ""
 | 
				
			||||||
done
 | 
					done
 | 
				
			||||||
read -n 1 -s -r -p "Press any key to continue..."$'\n'
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "
 | 
					echo "
 | 
				
			||||||
Go check:
 | 
					Go check:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue