mirror of
				https://gitea.augustin64.fr/piair/MsRewards-Reborn.git
				synced 2025-11-03 23:23:53 +01:00 
			
		
		
		
	grafana only works 30sec after start
This commit is contained in:
		@@ -452,7 +452,13 @@ def maxi(dict):
 | 
			
		||||
            m = int(i)
 | 
			
		||||
    return(m+1)
 | 
			
		||||
 | 
			
		||||
def setup_grafana():
 | 
			
		||||
    if get("http://localhost:3000/api/datasources").text == "[]" :
 | 
			
		||||
        subprocess.Popen(["bash",'/app/MsRewards-Reborn/grafana-config/request.sh'])
 | 
			
		||||
 | 
			
		||||
if __name__ == '__main__':
 | 
			
		||||
    print("this is launched")
 | 
			
		||||
    setup_grafana()
 | 
			
		||||
    update_jobs()
 | 
			
		||||
    edit_version()
 | 
			
		||||
    app.run(host='0.0.0.0', port=1234, debug=True)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,16 +1,3 @@
 | 
			
		||||
service grafana-server start
 | 
			
		||||
service nginx start
 | 
			
		||||
sleep 30
 | 
			
		||||
curl -X "POST" "http://192.168.1.32:5555/grafana/api/datasources" \
 | 
			
		||||
    -H "Content-Type: application/json" \
 | 
			
		||||
     --user admin:admin \
 | 
			
		||||
     --data-raw $'{"id":1,"uid":"bed26262-6b98-4dfc-a95d-f8bd39b5d09c","orgId":1,"name":"SQLite","type":"frser-sqlite-datasource","typeName":"SQLite","typeLogoUrl":"public/plugins/frser-sqlite-datasource/img/logo.svg","access":"proxy","url":"","user":"","database":"","basicAuth":false,"isDefault":true,"jsonData":{"attachLimit":0,"path":"/app/MsRewards-Reborn/MsRewards.db","pathPefix":"file:"},"readOnly":false}'
 | 
			
		||||
 | 
			
		||||
curl 'http://192.168.1.32:5555/grafana/api/dashboards/import' \
 | 
			
		||||
  -H 'content-type: application/json' \
 | 
			
		||||
  -H 'x-grafana-org-id: 1' \
 | 
			
		||||
  --user admin:admin \
 | 
			
		||||
  --data-raw $'{"dashboard":{"annotations":{"list":[{"builtIn":1,"datasource":{"type":"grafana","uid":"-- Grafana --"},"enable":true,"hide":true,"iconColor":"rgba(0, 211, 255, 1)","name":"Annotations & Alerts","type":"dashboard"}]},"editable":true,"fiscalYearStartMonth":0,"graphTooltip":0,"id":null,"links":[],"liveNow":false,"panels":[{"datasource":{"type":"frser-sqlite-datasource","uid":"bed26262-6b98-4dfc-a95d-f8bd39b5d09c"},"fieldConfig":{"defaults":{"color":{"mode":"thresholds"},"mappings":[],"max":10000,"thresholds":{"mode":"absolute","steps":[{"color":"dark-red","value":null},{"color":"dark-yellow","value":2000},{"color":"green","value":7500},{"color":"blue","value":10000}]}},"overrides":[]},"gridPos":{"h":11,"w":24,"x":0,"y":0},"id":3,"options":{"displayMode":"gradient","minVizHeight":10,"minVizWidth":0,"orientation":"auto","reduceOptions":{"calcs":["lastNotNull"],"fields":"","values":false},"showUnfilled":true,"valueMode":"color"},"pluginVersion":"10.0.3","targets":[{"datasource":{"type":"frser-sqlite-datasource","uid":"bed26262-6b98-4dfc-a95d-f8bd39b5d09c"},"queryText":"SELECT\\n  unixepoch() as time,\\n  c.compte,\\n  c.last_pts as \\"\\"\\nFROM \\n  comptes c;\\n","queryType":"time series","rawQueryText":"SELECT\\n  unixepoch() as time,\\n  c.compte,\\n  c.last_pts as \\"\\"\\nFROM \\n  comptes c;\\n","refId":"A","timeColumns":["time","ts"]}],"title":"Account points","type":"bargauge"},{"datasource":{"type":"frser-sqlite-datasource","uid":"bed26262-6b98-4dfc-a95d-f8bd39b5d09c"},"fieldConfig":{"defaults":{"color":{"mode":"thresholds"},"mappings":[],"max":300,"thresholds":{"mode":"absolute","steps":[{"color":"dark-red","value":null},{"color":"dark-green","value":200}]}},"overrides":[]},"gridPos":{"h":11,"w":24,"x":0,"y":11},"id":4,"options":{"displayMode":"gradient","minVizHeight":10,"minVizWidth":0,"orientation":"auto","reduceOptions":{"calcs":["lastNotNull"],"fields":"","values":false},"showUnfilled":true,"valueMode":"color"},"pluginVersion":"10.0.3","targets":[{"datasource":{"type":"frser-sqlite-datasource","uid":"bed26262-6b98-4dfc-a95d-f8bd39b5d09c"},"queryText":"SELECT\\n  unixepoch() as time,\\n  c.compte as metric,\\n  c.last_pts - d2.points as \'\'\\nFROM \\n  comptes c \\nLEFT OUTER JOIN \\n  daily d1 \\nON \\n  c.compte = d1.compte \\nAND \\n  d1.date = date()  \\n  LEFT OUTER JOIN daily d2 ON c.compte = d2.compte  AND  d2.date = DATE(\'now\',\'-1 day\')\\nORDER BY d1.points DESC","queryType":"time series","rawQueryText":"SELECT\\n  unixepoch() as time,\\n  c.compte as metric,\\n  c.last_pts - d2.points as \'\'\\nFROM \\n  comptes c \\nLEFT OUTER JOIN \\n  daily d1 \\nON \\n  c.compte = d1.compte \\nAND \\n  d1.date = date()  \\n  LEFT OUTER JOIN daily d2 ON c.compte = d2.compte  AND  d2.date = DATE(\'now\',\'-1 day\')\\nORDER BY d1.points DESC","refId":"A","timeColumns":["time","ts"]}],"title":"Daily progress","type":"bargauge"}],"refresh":"","schemaVersion":38,"style":"dark","tags":[],"templating":{"list":[]},"time":{"from":"now-6h","to":"now"},"timepicker":{},"timezone":"","title":"main","uid":"stats","version":14,"weekStart":""},"overwrite":true,"inputs":[],"folderUid":""}' \
 | 
			
		||||
  --compressed \
 | 
			
		||||
  --insecure
 | 
			
		||||
gunicorn --reload -w 4 -b 0.0.0.0:6666 'app:app'
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@
 | 
			
		||||
          "type": "grafana",
 | 
			
		||||
          "uid": "-- Grafana --"
 | 
			
		||||
        },
 | 
			
		||||
        "enable": true,
 | 
			
		||||
        "enable": false,
 | 
			
		||||
        "hide": true,
 | 
			
		||||
        "iconColor": "rgba(0, 211, 255, 1)",
 | 
			
		||||
        "name": "Annotations & Alerts",
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,14 @@
 | 
			
		||||
sleep 30
 | 
			
		||||
curl -X "POST" "http://192.168.1.32:5555/grafana/api/datasources" \
 | 
			
		||||
    -H "Content-Type: application/json" \
 | 
			
		||||
     --user admin:admin \
 | 
			
		||||
     --data-raw $'{"id":1,"uid":"bed26262-6b98-4dfc-a95d-f8bd39b5d09c","orgId":1,"name":"SQLite","type":"frser-sqlite-datasource","typeName":"SQLite","typeLogoUrl":"public/plugins/frser-sqlite-datasource/img/logo.svg","access":"proxy","url":"","user":"","database":"","basicAuth":false,"isDefault":true,"jsonData":{"attachLimit":0,"path":"/app/MsRewards-Reborn/MsRewards.db","pathPefix":"file:"},"readOnly":false}'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
curl 'http://192.168.1.32:5555/grafana/api/dashboards/import' \
 | 
			
		||||
  -H 'content-type: application/json' \
 | 
			
		||||
  -H 'x-grafana-org-id: 1' \
 | 
			
		||||
  --user admin:admin \
 | 
			
		||||
  --data-raw $'{"dashboard":{"annotations":{"list":[{"builtIn":1,"datasource":{"type":"grafana","uid":"-- Grafana --"},"enable":true,"hide":true,"iconColor":"rgba(0, 211, 255, 1)","name":"Annotations & Alerts","type":"dashboard"}]},"editable":true,"fiscalYearStartMonth":0,"graphTooltip":0,"id":null,"links":[],"liveNow":false,"panels":[{"datasource":{"type":"frser-sqlite-datasource","uid":"bed26262-6b98-4dfc-a95d-f8bd39b5d09c"},"fieldConfig":{"defaults":{"color":{"mode":"thresholds"},"mappings":[],"max":10000,"thresholds":{"mode":"absolute","steps":[{"color":"dark-red","value":null},{"color":"dark-yellow","value":2000},{"color":"green","value":7500},{"color":"blue","value":10000}]}},"overrides":[]},"gridPos":{"h":11,"w":24,"x":0,"y":0},"id":3,"options":{"displayMode":"gradient","minVizHeight":10,"minVizWidth":0,"orientation":"auto","reduceOptions":{"calcs":["lastNotNull"],"fields":"","values":false},"showUnfilled":true,"valueMode":"color"},"pluginVersion":"10.0.3","targets":[{"datasource":{"type":"frser-sqlite-datasource","uid":"bed26262-6b98-4dfc-a95d-f8bd39b5d09c"},"queryText":"SELECT\\n  unixepoch() as time,\\n  c.compte,\\n  c.last_pts as \\"\\"\\nFROM \\n  comptes c;\\n","queryType":"time series","rawQueryText":"SELECT\\n  unixepoch() as time,\\n  c.compte,\\n  c.last_pts as \\"\\"\\nFROM \\n  comptes c;\\n","refId":"A","timeColumns":["time","ts"]}],"title":"Account points","type":"bargauge"},{"datasource":{"type":"frser-sqlite-datasource","uid":"bed26262-6b98-4dfc-a95d-f8bd39b5d09c"},"fieldConfig":{"defaults":{"color":{"mode":"thresholds"},"mappings":[],"max":300,"thresholds":{"mode":"absolute","steps":[{"color":"dark-red","value":null},{"color":"dark-green","value":200}]}},"overrides":[]},"gridPos":{"h":11,"w":24,"x":0,"y":11},"id":4,"options":{"displayMode":"gradient","minVizHeight":10,"minVizWidth":0,"orientation":"auto","reduceOptions":{"calcs":["lastNotNull"],"fields":"","values":false},"showUnfilled":true,"valueMode":"color"},"pluginVersion":"10.0.3","targets":[{"datasource":{"type":"frser-sqlite-datasource","uid":"bed26262-6b98-4dfc-a95d-f8bd39b5d09c"},"queryText":"SELECT\\n  unixepoch() as time,\\n  c.compte as metric,\\n  c.last_pts - d2.points as \'\'\\nFROM \\n  comptes c \\nLEFT OUTER JOIN \\n  daily d1 \\nON \\n  c.compte = d1.compte \\nAND \\n  d1.date = date()  \\n  LEFT OUTER JOIN daily d2 ON c.compte = d2.compte  AND  d2.date = DATE(\'now\',\'-1 day\')\\nORDER BY d1.points DESC","queryType":"time series","rawQueryText":"SELECT\\n  unixepoch() as time,\\n  c.compte as metric,\\n  c.last_pts - d2.points as \'\'\\nFROM \\n  comptes c \\nLEFT OUTER JOIN \\n  daily d1 \\nON \\n  c.compte = d1.compte \\nAND \\n  d1.date = date()  \\n  LEFT OUTER JOIN daily d2 ON c.compte = d2.compte  AND  d2.date = DATE(\'now\',\'-1 day\')\\nORDER BY d1.points DESC","refId":"A","timeColumns":["time","ts"]}],"title":"Daily progress","type":"bargauge"}],"refresh":"","schemaVersion":38,"style":"dark","tags":[],"templating":{"list":[]},"time":{"from":"now-6h","to":"now"},"timepicker":{},"timezone":"","title":"main","uid":"stats","version":14,"weekStart":""},"overwrite":true,"inputs":[],"folderUid":""}' \
 | 
			
		||||
  --compressed \
 | 
			
		||||
  --insecure
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user