diff --git a/docker/prod-values.yml b/docker/prod-values.yml index f24ad1e..e80dbd4 100644 --- a/docker/prod-values.yml +++ b/docker/prod-values.yml @@ -103,11 +103,11 @@ configmaps: variables: application: myuw panels: - - name: MyUW Status + - name: MyUW Service services: # list of application components and the prometheus query to determine health - name: MyUW - description: UW student and faculty information portal + description: UW enterprise portal link: https://test.my.uw.edu # # query should return a scalar value to test the threshold values against @@ -121,7 +121,7 @@ configmaps: description: Critical - limit: 0.99 description: Degraded - - name: Critical Dependency Status + - name: Critical Services description: Services required to provide MyUW access and content. critical_description: As not all critical services appear healthy, MyUW is likely unavailable and serving an error page. services: @@ -134,89 +134,88 @@ configmaps: service: kws - <<: *web-service-block name: Group Web Service (GWS) - description: Required for user affiliation information + description: Required for user affiliations level: Blocker variables: service: gws - <<: *web-service-block name: Person Web Service (PWS) - description: Required for specific user information + description: Required for user profile level: Blocker variables: service: pws - <<: *web-service-block name: Student Web Service (SWS) - description: Source of course, personal enrollment, notice, and registration information + description: Source of course, student enrollments, notices, and registrations variables: service: sws - <<: *web-service-block name: IdP OIDC Keyset - description: Required for mobile application authentication + description: Required for mobile-app authentication level: Blocker variables: service: uwidp - <<: *web-service-block name: UWNetID Web Service - description: Source of uwnetid password and subscription information + description: Source of uwnetid password and subscriptions variables: service: uwnetid - - name: Secondary Dependency Status - description: Services providing specific MyUW content. + - name: Secondary Services + description: Providing specific MyUW content critical_description: As not all services appear healthy, some MyUW content may be missing or displaying an error message. services: - <<: *web-service-block name: SDB Applicant Service - description: Source of undergrad application information + description: Source of undergraduate application variables: service: sdbmyuw - <<: *web-service-block name: MyPlan Auth Service - description: Source of MyPlan authentication + description: Support MyPlan authentication variables: service: myplan_auth - <<: *web-service-block name: MyPlan Service - description: Source of MyPlan course registration information + description: Source of student course registration plan variables: service: myplan - <<: *web-service-block name: Canvas Course Service - description: Source of Canvas course information + description: Source of course data on Canvas LMS variables: service: canvas - <<: *web-service-block - name: Instructor Course Dashboard (CoDa) - description: Source of instructor course dashboard information + name: Course Statistics Dashboard (CoDa) + description: Source of current and historic student statistics variables: service: coda - <<: *web-service-block name: Gradepage Service - description: Source of grade submission information + description: Source of grade submission status variables: service: gradepage - <<: *web-service-block name: MailMan Service - description: Source of instructor class mailing list request data + description: Source of instructor class mailing list request variables: service: mailman - <<: *web-service-block name: Housing and Food Services (HFS) - description: Provides employee/student Husky card, student housing and dining balance information - variables: + description: Source of employee/student Husky card, student housing and dining balances service: hfs - <<: *web-service-block name: MyGrad Service - description: Source of graduate committee, degree, leave, petition information + description: Source of committee, degree, leave, petition of graduate students variables: service: grad - <<: *web-service-block name: Library Account Service - description: Source of user library account information + description: Source of library fines, holds, loaned items, due date variables: service: libraries - <<: *web-service-block name: Library Curriculum Service - description: Source of library Curriculum information + description: Source of library curriculum subject guide variables: service: libcurric - <<: *web-service-block @@ -226,7 +225,7 @@ configmaps: service: book - <<: *web-service-block name: Iasystem Instructor Course Evaluation Services - description: Source of course evaluation information + description: Source of course evaluation submission status variables: service: iasystem - <<: *web-service-block diff --git a/docker/test-values.yml b/docker/test-values.yml index 9a9c8fd..b746a2f 100644 --- a/docker/test-values.yml +++ b/docker/test-values.yml @@ -103,11 +103,11 @@ configmaps: variables: application: myuw panels: - - name: MyUW Status + - name: MyUW Service services: # list of application components and the prometheus query to determine health - name: MyUW - description: UW student and faculty information portal + description: UW enterprise portal link: https://test.my.uw.edu # # query should return a scalar value to test the threshold values against @@ -121,7 +121,7 @@ configmaps: description: Critical - limit: 0.99 description: Degraded - - name: Critical Dependency Status + - name: Critical Services description: Services required to provide MyUW access and content. critical_description: As not all critical services appear healthy, MyUW is likely unavailable and serving an error page. services: @@ -134,89 +134,89 @@ configmaps: service: kws - <<: *web-service-block name: Group Web Service (GWS) - description: Required for user affiliation information + description: Required for user affiliations level: Blocker variables: service: gws - <<: *web-service-block name: Person Web Service (PWS) - description: Required for specific user information + description: Required for user profile level: Blocker variables: service: pws - <<: *web-service-block name: Student Web Service (SWS) - description: Source of course, personal enrollment, notice, and registration information + description: Source of courses, enrollments, noticess, and registrations variables: service: sws - <<: *web-service-block name: IdP OIDC Keyset - description: Required for mobile application authentication + description: Required for mobile-app authentication level: Blocker variables: service: uwidp - <<: *web-service-block name: UWNetID Web Service - description: Source of uwnetid password and subscription information + description: Source of uwnetid password and subscriptions variables: service: uwnetid - - name: Secondary Dependency Status - description: Services providing specific MyUW content. + - name: Secondary Services + description: Services providing specific contents on MyUW critical_description: As not all services appear healthy, some MyUW content may be missing or displaying an error message. services: - <<: *web-service-block name: SDB Applicant Service - description: Source of undergrad application information + description: Source of undergraduate application variables: service: sdbmyuw - <<: *web-service-block name: MyPlan Auth Service - description: Source of MyPlan authentication + description: Support MyPlan authentication variables: service: myplan_auth - <<: *web-service-block name: MyPlan Service - description: Source of MyPlan course registration information + description: Source of student course registration plan variables: service: myplan - <<: *web-service-block name: Canvas Course Service - description: Source of Canvas course information + description: Source of course data on Canvas LMS variables: service: canvas - <<: *web-service-block - name: Instructor Course Dashboard (CoDa) - description: Source of instructor course dashboard information + name: Course Statistics Dashboard (CoDa) + description: Source of current and historic student statistics variables: service: coda - <<: *web-service-block name: Gradepage Service - description: Source of grade submission information + description: Source of grade submission status variables: service: gradepage - <<: *web-service-block name: MailMan Service - description: Source of instructor class mailing list request data + description: Source of instructor class mailing list requests variables: service: mailman - <<: *web-service-block name: Housing and Food Services (HFS) - description: Provides employee/student Husky card, student housing and dining balance information + description: Source of employee/student Husky card, student housing and dining balances variables: service: hfs - <<: *web-service-block name: MyGrad Service - description: Source of graduate committee, degree, leave, petition information + description: Source of committee, degree, leave, petition of graduate students variables: service: grad - <<: *web-service-block name: Library Account Service - description: Source of user library account information + description: Source of user library fines, holds, loaned items, due date, etc. variables: service: libraries - <<: *web-service-block name: Library Curriculum Service - description: Source of library Curriculum information + description: Source of library curriculum subject guide variables: service: libcurric - <<: *web-service-block @@ -226,12 +226,12 @@ configmaps: service: book - <<: *web-service-block name: Iasystem Instructor Course Evaluation Services - description: Source of course evaluation information + description: Source of course evaluation submission status variables: service: iasystem - <<: *web-service-block name: U-PASS Service - description: Source of employee/student bus pass information + description: Source of employee/student bus pass variables: service: upass - app_name: Provision Request Tool diff --git a/status_dashboard/static/dashboard.css b/status_dashboard/static/dashboard.css index 7441335..fe79e64 100644 --- a/status_dashboard/static/dashboard.css +++ b/status_dashboard/static/dashboard.css @@ -34,7 +34,6 @@ html, body { .overall-status .status { font-size: 1.2em; - font-weight: 500; line-height: 2em; width: 50%; color: white; @@ -77,7 +76,7 @@ html, body { .panel div { font-size: .6em; - font-weight: 300; + font-weight: 400; } .panel div.critical { @@ -99,10 +98,10 @@ html, body { .service { border: 1px solid #ff8080; border-radius: 10px; - width: 21.5em; + width: 20em; min-height: 3em; margin: 0 20px 20px 0; - padding: 0; + padding: 5px; background-color: #ffefef; } @@ -113,7 +112,7 @@ html, body { .service .description { padding: 8px 10px; - width: 18em; + width: 15em; float: left; } @@ -132,21 +131,21 @@ html, body { margin-left: .25em; } -.service .description .status { - font-size: .85em; - font-weight: 400; +.service .description .desc { + font-size: .9em; + margin-left: .25em; } .service .health { - width: 2.1em; + padding: 8px 10px; + width: 4em; float: right; + text-align: left; } -.service .health { - vertical-align: middle; - text-align: center; - font-size: 1.5em; - line-height: 3em; +.service .health .status { + font-size: .9em; + margin-top: 2px; } .service .health .nominal { diff --git a/status_dashboard/templates/service.html b/status_dashboard/templates/service.html index eff8ff7..714082c 100644 --- a/status_dashboard/templates/service.html +++ b/status_dashboard/templates/service.html @@ -2,12 +2,17 @@
{{service.name}} - {%if service.description %}{% endif %} - {% if service.link %}{% endif %}
-
{{service.status}}
+
+ {%if service.description %}{{service.description}}{% endif %} + {% if service.link %} + + {% endif %} +
+
{{service.status}}