Alert page enhancements++ (#34)

* update SP * dunno * seed config update * update SP * update SP * update SP * update SP * update SP * update SP * update SP * update K * update seed config * update default config * update SP and K * wip: multiple things :) * [ch1076] * update SP * fix linting * acls in alert.py * acls in alert.py * add spinner * do not override standard SP docker cmd * update SP * update SP * update SP * update SP * update SP * update default comfig * update K * update default config * update SP * update SP * address feedback * update SP * address feedback; add build command to fritz * add basic taxonomy to seed config * fix typo * fix linting * update SP * fix typo * update SP * autostash in fritz::build * add Outbursting Stars group to seed config * use StreamUser to get user accessible streams * fix linting * update CLU filter example * update default config * update default config * update seed config * update SP * add outbursting stars group to seed config
fritz-marshal · Sep 16, 2020 · 382da41 · 382da41
1 parent 78f8604
commit 382da41
Show file tree

Hide file tree

Showing 17 changed files with 1,606 additions and 941 deletions.
diff --git a/doc/data/filter_examples/fritz_filter_clu.json b/doc/data/filter_examples/fritz_filter_clu.json
@@ -556,104 +556,196 @@
   {
     "$project": {
       "objectId": 1,
-      "cross_matches_CLU": 1,
-      "annotations.FWHM": "$fwhm",
-      "annotations.drb": "$drb",
+      "annotations.FWHM": {
+        "$round": [
+          "$fwhm", 3
+        ]
+      },
+      "annotations.drb": {
+        "$round": [
+          "$drb", 5
+        ]
+      },
       "annotations.host g-r": {
-        "$subtract": [
-          "$sgmag", "$srmag"
+        "$round": [
+          {
+            "$subtract": [
+              "$sgmag", "$srmag"
+            ]
+          }, 3
         ]
       },
       "annotations.host r-i": {
-        "$subtract": [
-          "$srmag", "$simag"
+        "$round": [
+          {
+            "$subtract": [
+              "$srmag", "$simag"
+            ]
+          }, 3
+        ]
+      },
+      "annotations.mag at max": {
+        "$round": [
+          "$m_max", 3
         ]
       },
-      "annotations.mag at max": "$m_max",
       "annotations.time at max": "$t_max",
-      "annotations.min-mag": "$m_min",
+      "annotations.min-mag": {
+        "$round": [
+          "$m_min", 3
+        ]
+      },
       "annotations.min-time": "$t_min",
       "annotations.time difference": {
-        "$subtract": [
-          "$t_max", "$t_min"
+        "$round": [
+          {
+            "$subtract": [
+              "$t_max", "$t_min"
+            ]
+          }, 5
         ]
       },
       "annotations.mag diff": {
-        "$subtract": [
-          "$m_min", "$m_max"
+        "$round": [
+          {
+            "$subtract": [
+              "$m_min", "$m_max"
+            ]
+          }, 3
         ]
       },
       "annotations.rise rate": {
-        "$cond": {
-          "if": {
-            "$gt": [
-              {
-                "$subtract": [
-                  "$t_max", "$t_min"
-                ]
-              }, 0
-            ]
-          },
-          "then": {
-            "$divide": [
-              {
-                "$subtract": [
-                  "$m_min", "$m_max"
+        "$round": [
+          {
+            "$cond": {
+              "if": {
+                "$gt": [
+                  {
+                    "$subtract": [
+                      "$t_max", "$t_min"
+                    ]
+                  }, 0
                 ]
-              }, {
-                "$subtract": [
-                  "$t_max", "$t_min"
+              },
+              "then": {
+                "$divide": [
+                  {
+                    "$subtract": [
+                      "$m_min", "$m_max"
+                    ]
+                  }, {
+                    "$subtract": [
+                      "$t_max", "$t_min"
+                    ]
+                  }
                 ]
-              }
-            ]
-          },
-          "else": null
-        }
+              },
+              "else": null
+            }
+          }, 5
+        ]
       },
       "annotations.decay rate": {
-        "$cond": {
-          "if": {
-            "$lt": [
-              {
-                "$subtract": [
-                  "$t_max", "$t_min"
-                ]
-              }, 0
-            ]
-          },
-          "then": {
-            "$divide": [
-              {
-                "$subtract": [
-                  "$m_max", "$m_min"
+        "$round": [
+          {
+            "$cond": {
+              "if": {
+                "$lt": [
+                  {
+                    "$subtract": [
+                      "$t_max", "$t_min"
+                    ]
+                  }, 0
                 ]
-              }, {
-                "$subtract": [
-                  "$t_max", "$t_min"
+              },
+              "then": {
+                "$divide": [
+                  {
+                    "$subtract": [
+                      "$m_max", "$m_min"
+                    ]
+                  }, {
+                    "$subtract": [
+                      "$t_max", "$t_min"
+                    ]
+                  }
                 ]
-              }
-            ]
-          },
-          "else": null
-        }
+              },
+              "else": null
+            }
+          }, 5
+        ]
+      },
+      "annotations.host ZTF ref PSF r-mag": {
+        "$round": [
+          "$magnr", 3
+        ]
+      },
+      "annotations.PS1 psf r-mag": {
+        "$round": [
+          "$srmag", 3
+        ]
+      },
+      "annotations.rb score": {
+        "$round": [
+          "$rbscore", 5
+        ]
+      },
+      "annotations.sgscore1": {
+        "$round": [
+          "$sgscore", 5
+        ]
+      },
+      "annotations.ZOGI scorr": {
+        "$round": [
+          "$scorr", 3
+        ]
+      },
+      "annotations.distpsnr1": {
+        "$round": [
+          "$distpsnr1", 3
+        ]
+      },
+      "annotations.distpsnr2": {
+        "$round": [
+          "$distpsnr2", 3
+        ]
+      },
+      "annotations.distpsnr3": {
+        "$round": [
+          "$distpsnr3", 3
+        ]
+      },
+      "annotations.magpsf": {
+        "$round": [
+          "$m_now", 3
+        ]
+      },
+      "annotations.elongation": {
+        "$round": [
+          "$elong", 3
+        ]
+      },
+      "annotations.magap_min_magpsf": {
+        "$round": [
+          "$psfminap", 3
+        ]
+      },
+      "annotations.gal_lat": {
+        "$round": [
+          "$gal_lat", 5
+        ]
       },
-      "annotations.host ZTF ref PSF r-mag": "$magnr",
-      "annotations.PS1 psf r-mag": "$srmag",
-      "annotations.rb score": "$rbscore",
-      "annotations.sgscore1": "$sgscore",
-      "annotations.ZOGI scorr": "$scorr",
-      "annotations.distpsnr1": "$distpsnr1",
-      "annotations.distpsnr2": "$distpsnr2",
-      "annotations.distpsnr3": "$distpsnr3",
-      "annotations.magpsf": "$m_now",
-      "annotations.elongation": "$elong",
-      "annotations.magap_min_magpsf": "$psfminap",
-      "annotations.gal_lat": "$gal_lat",
       "annotations.deltajd": {
-        "$subtract": [
-          "$jdendhist", "$jdstarthist"
+        "$round": [
+          {
+            "$subtract": [
+              "$jdendhist", "$jdstarthist"
+            ]
+          }, 5
         ]
-      }
+      },
+      "annotations.cross_matches_CLU": "$cross_matches_CLU"
     }
   }
 ]
diff --git a/docker-compose.traefik.defaults.yaml b/docker-compose.traefik.defaults.yaml
@@ -12,6 +12,8 @@ services:
     command:
       # fixme: comment out if do not want the traefik dashboard on port 8090
       - "--api.insecure=true"
+      - "--metrics=true"
+      - "--metrics.prometheus=true"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
       - "--providers.docker.network=proxy"