Merge branch 'master' of http://git.choozmo.com:3000/choozmo/kw_tools into master

monitor/GA_Daily.py

@@ -18,7 +18,7 @@ from googleapiclient.discovery import build
 from oauth2client.service_account import ServiceAccountCredentials
 import dataset
 from datetime import datetime
-import schedule
+
 
 db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/hhh?charset=utf8mb4')
 db.query('delete from ga_pagepath')
@@ -27,7 +27,7 @@ db.begin()
 table=db['ga_pagepath']
 
 SCOPES = ['https://www.googleapis.com/auth/analytics.readonly']
-KEY_FILE_LOCATION = 'c:\\keys\\choozmo-ga-beee24b7a4c1.json' #'c:\\keys\\choozmo-ga-beee24b7a4c1.json'
+KEY_FILE_LOCATION = '/root/src/kw_tools/monitor/choozmo-ga-beee24b7a4c1.json' #'c:\\keys\\choozmo-ga-beee24b7a4c1.json'
 VIEW_ID = '188916214'
 
 # line notify header
@@ -36,25 +36,32 @@ headers = {
         "Content-Type": "application/x-www-form-urlencoded"
 }
 
+com_table = []
+def creat_table():
+  for i in range(0,24):
+    com_table.append([i,2650*i])
+  com_table.append([24,62000])
+  print(com_table)
+
 def send_msg(kw):
   # line notify send message
     current_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S') #現在時間
+    hour = datetime.now().strftime('%H') 
     # 判斷是否達標
     complet="否"
-    if int(kw) > 56000 : 
-      complet="是"
+    for i in range(0,25):
+      if int(hour)+1==com_table[i][0]:
+        print(i)
+        if int(kw) > com_table[i][1] : 
+          complet="是"
+      elif int(hour) == 24:
+        if int(kw) > 56000 : 
+          complet="是"
     params = {"message": "\n現在時間: " + current_time + "\n當前pageViews: "+kw + "\n是否達標: " + complet}  
     print(params)
     r = requests.post("https://notify-api.line.me/api/notify",headers=headers, params=params)
     print(r.text)
 
-def scheduleMonitor():
-  # 清空任務
-  schedule.clear()
-  # 建立一個按1小時隔執行任務
-  schedule.every(1).hours.do(main)
-  while True:
-    schedule.run_pending()
 
 def initialize_analyticsreporting():
   """Initializes an Analytics Reporting API V4 service object.
@@ -119,9 +126,9 @@ def print_response(response):
 def main():
   analytics = initialize_analyticsreporting()
 #(FB_|facebook|IG_|LINE_|LINEMP_|qsear.ch)
-
+  current_time = datetime.now().strftime('%Y-%m-%d') #現在時間
   body=[{ 'viewId': VIEW_ID,
-  'dateRanges': [{'startDate': '2021-11-03', 'endDate': '2021-11-03'}],
+  'dateRanges': [{'startDate': current_time, 'endDate': current_time}],
 
   'metrics': [{'expression': 'ga:users'},{'expression': 'ga:newusers'},{'expression': 'ga:sessions'},{'expression': 'ga:pageviews'},{'expression': 'ga:bounceRate'},{'expression': 'ga:pageviewsPerSession'}],
 #  'dimensions': [{'name': 'ga:pagePath'}],
@@ -135,9 +142,12 @@ def main():
   result=[]
   for elmt in ga_dict:
       print(elmt)
-      send_msg(elmt['ga:pageviews'])
+      hour = datetime.now().strftime('%H')
+      if int(hour)+1 > 8 :
+      	send_msg(elmt['ga:pageviews'])
 #      result.append(elmt)
   print('inserting.....')
 
 if __name__ == '__main__':
-  scheduleMonitor()
+  creat_table()
+  main()

monitor/choozmo-ga-beee24b7a4c1.json

@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "project_id": "choozmo-ga",
+  "private_key_id": "beee24b7a4c14b052a7be0db09062d555a1f7faf",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC7X6pGPpaDG5iY\nYdYbaVVRAo2WEvVLIUrDu4MOdIy1H2h8vPvuZiXJ8G/npQ3V8vAY8dZI39Xpv0JS\nyeP5CRM1i3ANcS8Tmw8Eyi6eoejOYqZl1T1rLyD76tgihXG0mUFjWogwCikdmpMF\nGd2c57bN5jADs/VtC9/tGNHud1pSsnO1zrHnR2MNpCkRNmaBzqoOHoEaL0gvPXmz\nShZPaJSxnfk6Fh53BzRng5kXD57fVFZN0k9wxIW9TC/jg2rxiR6tRJ+nvKtOUuN5\nXLq0NvQtFwYx7UPH3uLJNWrYV1blCWZrU9xJGxHSBKcU+OVPTX40uStKBOvI5hrr\ncqkxZrD1AgMBAAECggEAAPrKnaq0Z9ot1Z25vE1BCMo+4JBxgsay7zi/tWrKFPG/\nJQ6dSzCMO4gbvN+pzBsEtgvgcmNkz3lN+NFWtT9ev8p4F9xMe8MbuvGheN5aixoZ\nPR72WH7EiSFzJyRAxTBoI8N+KUqJ6Jf3JoRtWnJPf1GYCCwf2R9bnxytW+lFvV9w\nfJgeGWXNfIeV+e/GpFSYEYK+ASMY94sCx2F6BABizd+Ph3S5WVK5LcvxI08Z31UZ\n3CrJ+UJxVsCmtVAp970iTpN3tkVw2cUDeSr1SSngbffFII1qIw0A+RqyqLXGMvK5\nCLiRVrWkOcFtl8RX95ckHCj56GleDTwYs0TVBvX64QKBgQDognumYFk850jauGAc\nJXoLbhP1p6fmWN9/Ki5/+BGnf5zreBKIIwkK0JuqWSerQYXQsJ6bTyCoQxPjLwdo\nQj2a3j72DASntykKVriX87pT6BUFUFOk+yQLHFP/H4ebOOE3Xq54/2uavzMvlJ13\nqPciYqy0lUceoxYBMPPH1xN9YQKBgQDOTc55Tf+bKWc314vuT5pKDEDZUAKw47hA\nZbpHICnojmlZgNNba4KpjkxudgERlpRdSyG+CCavy3BmbrlwGR95tw8CrE1++CD2\neT75KJahgaMC2Ce66s7sEMq8XgyUPszJhU3koYYfjQGxx8Efec2Pod6wd6VJNH7A\nIzelQJ5oFQKBgQDgWngB9NpnAC22j05+GlOHj/JGij5i8MLIK+WuqaovW94JAFWx\nc00YWG68k0bJ43HCC4sgBdxXQFKCVzDok3Jqa6WJOdOMGhrJ1SBNz2qt6DXQaNAt\nVABVkEIk3UG2r83x5bSpIJ2uNmynrtm7Sxkc3uYTYi+8ClYDVD8HSCuQQQKBgD48\ntMxdnn31uKDdEuba9uXd2nZ0r8sjd8NdrRul9V6mD9wjhB+xSGLUffRY/yuKLMoU\nT2Kf3OPt0MPmJWVO/vLeKdYZmutx+afBniDWgNLKZB4IjbvS+Ie47SB0kwDqDSfC\nYmRV4juEc31pkLZpLX1mTOMZxTBXeOGH/lKJMwCdAoGBAL0Kp57I7+8ihc2izD4s\nEajUMsft8ZCkp4nZjR6HVtvfxTN2lbjvwPL8B8g71usxJ+4j9zdTnRSRGSrNQKzN\nzFIbX46vBx97hGdDlTNx063DravTpNP6BhZQ7GXxqWwKz5DMXTTAoV7NMKgUs7bk\nloIJP31z1HcHYjErKa65SnhE\n-----END PRIVATE KEY-----\n",
+  "client_email": "ga-reporter@choozmo-ga.iam.gserviceaccount.com",
+  "client_id": "100209334727047751767",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/ga-reporter%40choozmo-ga.iam.gserviceaccount.com"
+}