Merge branch 'master' into postgres-support

.github/ISSUE_TEMPLATE/ask-for-help.yaml

@@ -24,7 +24,7 @@ body:
       required: true
     attributes:
       label: "📝 Describe your problem"
-      description: "Please walk us through it step by step."
+      description: "Please walk us through it step by step. Include all important details and add screenshots where appropriate"
       placeholder: "Describe what are you asking for..."
   - type: textarea
     id: error-msg
@@ -56,19 +56,20 @@ body:
       placeholder: "Ex. Google Chrome 95.0.4638.69"
     validations:
       required: true
-  - type: input
+  - type: textarea
-    id: docker-version
+    id: deployment-info
-    attributes:
-      label: "🐋 Docker Version"
-      description: "If running with Docker, which version are you running?"
-      placeholder: "Ex. Docker 20.10.9 / K8S / Podman"
-    validations:
-      required: false
-  - type: input
-    id: nodejs-version
     attributes:
-      label: "🟩 NodeJS Version"
+      label: "🖥️ Deployment Environment"
-      description: "If running with Node.js? which version are you running?"
+      description: |
-      placeholder: "Ex. 14.18.0"
+        examples:
+          - **Runtime**: Docker 20.10.9 / nodejs 14.18.0 / K8S via ... v1.3.3 / ..
+          - **Database**: sqlite/embedded mariadb/external mariadb
+          - **Filesystem used to store the database on**: Windows/ZFS/btrfs/NFSv3 on a SSD/HDD/eMMC
+          - **number of monitors**: 42
+      value: |
+        - Runtime: 
+        - Database: 
+        - Filesystem used to store the database on: 
+        - number of monitors: 
     validations:
-      required: false
+      required: true

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -3,14 +3,14 @@ description: "Submit a bug report to help us improve"
 #title: "[Bug] "
 labels: [bug]
 body:
-  - type: checkboxes
+  - type: textarea
-    id: no-duplicate-issues
+    id: related-issues
+    validations:
+      required: true
     attributes:
-      label: "⚠️ Please verify that this bug has NOT been raised before."
+      label: "📑 I have found these related issues/pull requests"
-      description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
+      description: "Search related issues by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=) and explain what the difference between them or explain that you are unable to find any related issues"
-      options:
+      placeholder: "Related to #1 by also touching the ... system. They should not be merged because ..."
-        - label: "I checked and didn't find similar issue"
-          required: true
   - type: checkboxes
     attributes:
       label: "🛡️ Security Policy"
@@ -31,7 +31,7 @@ body:
       required: true
     attributes:
       label: "👟 Reproduction steps"
-      description: "How do you trigger this bug? Please walk us through it step by step."
+      description: "How do you trigger this bug? Please walk us through it step by step. Include all important details and add screenshots where appropriate"
       placeholder: "..."
   - type: textarea
     id: expected-behavior
@@ -73,22 +73,23 @@ body:
       placeholder: "Ex. Google Chrome 95.0.4638.69"
     validations:
       required: true
-  - type: input
+  - type: textarea
-    id: docker-version
+    id: deployment-info
-    attributes:
-      label: "🐋 Docker Version"
-      description: "If running with Docker, which version are you running?"
-      placeholder: "Ex. Docker 20.10.9 / K8S / Podman"
-    validations:
-      required: false
-  - type: input
-    id: nodejs-version
     attributes:
-      label: "🟩 NodeJS Version"
+      label: "🖥️ Deployment Environment"
-      description: "If running with Node.js? which version are you running?"
+      description: |
-      placeholder: "Ex. 14.18.0"
+        examples:
+          - **Runtime**: Docker 20.10.9 / nodejs 14.18.0 / K8S via ... v1.3.3 / ..
+          - **Database**: sqlite/embedded mariadb/external mariadb
+          - **Filesystem used to store the database on**: Windows/ZFS/btrfs/NFSv3 on a SSD/HDD/eMMC
+          - **number of monitors**: 42
+      value: |
+        - Runtime: 
+        - Database: 
+        - Filesystem used to store the database on: 
+        - number of monitors: 
     validations:
-      required: false
+      required: true
   - type: textarea
     id: logs
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -3,14 +3,14 @@ description: "Submit a proposal for a new feature"
 #title: "[Feature] "
 labels: [feature-request]
 body:
-  - type: checkboxes
+  - type: textarea
-    id: no-duplicate-issues
+    id: related-issues
+    validations:
+      required: true
     attributes:
-      label: "⚠️ Please verify that this feature request has NOT been suggested before."
+      label: "📑 I have found these related issues/pull requests"
-      description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
+      description: "Search related issues by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=) and explain what the difference between them or explain that you are unable to find any related issues"
-      options:
+      placeholder: "Related to #1 by also touching the ... system. They should not be merged because ..."
-        - label: "I checked and didn't find similar feature request"
-          required: true
   - type: dropdown
     id: feature-area
     attributes:
@@ -18,10 +18,17 @@ body:
       description: "What kind of feature request is this?"
       multiple: true
       options:
-        - API
+        - API / automation options
-        - New Notification
+        - New notification-provider
-        - New Monitor
+        - Change to existing notification-provider
-        - UI Feature
+        - New monitor
+        - Change to existing monitor
+        - Dashboard
+        - Status-page
+        - Maintenance
+        - Deployment
+        - Certificate expiry
+        - Settings
         - Other
     validations:
       required: true

.github/workflows/stale-bot.yml

@@ -11,12 +11,32 @@ jobs:
     steps:
       - uses: actions/stale@v8
         with:
-          stale-issue-message: 'We are clearing up our old issues and your ticket has been open for 3 months with no activity. Remove stale label or comment or this will be closed in 2 days.'
+          stale-issue-message: |-
-          close-issue-message: 'This issue was closed because it has been stalled for 2 days with no activity.'
+            We are clearing up our old `help`-issues and your issue has been open for 60 days with no activity.
-          days-before-stale: 90
+            If no comment is made and the stale label is not removed, this issue will be closed in 7 days.
-          days-before-close: 2
+          days-before-stale: 60
+          days-before-close: 7
           days-before-pr-stale: -1
           days-before-pr-close: -1
           exempt-issue-labels: 'News,Medium,High,discussion,bug,doc,feature-request'
           exempt-issue-assignees: 'louislam'
           operations-per-run: 200
+      - uses: actions/stale@v8
+        with:
+          stale-issue-message: |-
+            This issue was marked as `cannot-reproduce` by a maintainer.
+            If an issue is non-reproducible, we cannot fix it, as we do not know what the underlying issue is.
+            If you have any ideas how we can reproduce this issue, we would love to hear them.
+            
+            We don't have a good way to deal with truely unreproducible issues and are going to close this issue in a month.
+            If think there might be other differences in our environment or in how we tried to reproduce this, we would appreciate any ideas.
+          close-issue-message: |-
+            This issue will be closed as no way to reproduce it has been found.
+            If you/somebody finds a way how to (semi-reliably) reproduce this, we can reopen this issue. ^^
+          days-before-stale: 180
+          days-before-close: 30
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          any-of-issue-labels: 'cannot-reproduce'
+          operations-per-run: 200
+    

extra/close-incorrect-issue.js

@@ -37,7 +37,7 @@ const github = require("@actions/github");
                 owner: issue.owner,
                 repo: issue.repo,
                 issue_number: issue.number,
-                body: `@${username}: Hello! :wave:\n\nThis issue is being automatically closed because it does not follow the issue template. Please DO NOT open a blank issue.`
+                body: `@${username}: Hello! :wave:\n\nThis issue is being automatically closed because it does not follow the issue template. Please **DO NOT open blank issues and use our [issue-templates](https://github.com/louislam/uptime-kuma/issues/new/choose) instead**.\nBlank Issues do not contain the context nessesary for a good discussions.`
             });
 
             // Close the issue

server/monitor-types/real-browser-monitor-type.js

@@ -96,7 +96,7 @@ async function getBrowser() {
 async function getRemoteBrowser(remoteBrowserID, userId) {
     let remoteBrowser = await RemoteBrowser.get(remoteBrowserID, userId);
     log.debug("MONITOR", `Using remote browser: ${remoteBrowser.name} (${remoteBrowser.id})`);
-    browser = chromium.connect(remoteBrowser.url);
+    browser = await chromium.connect(remoteBrowser.url);
     return browser;
 }
 

src/assets/vars.scss

@@ -4,6 +4,7 @@ $warning: #f8a306;
 $maintenance: #1747f5;
 $link-color: #111;
 $border-radius: 50rem;
+$secondary-text: #aaa;
 
 $highlight: #7ce8a4;
 $highlight-white: #e7faec;

src/components/HeartbeatBar.vue

@@ -309,7 +309,7 @@ export default {
 }
 
 .word {
-    color: #aaa;
+    color: $secondary-text;
     font-size: 12px;
 }
 

src/i18n.js

@@ -44,6 +44,7 @@ const languageList = {
     "ur": "Urdu",
     "ge": "ქართული",
     "uz": "O'zbek tili",
+    "ga": "Gaeilge",
 };
 
 let messages = {

src/pages/Details.vue

@@ -2,10 +2,18 @@
     <transition name="slide-fade" appear>
         <div v-if="monitor">
             <router-link v-if="group !== ''" :to="monitorURL(monitor.parent)"> {{ group }}</router-link>
-            <h1> {{ monitor.name }}</h1>
+            <h1>
+                {{ monitor.name }}
+                <div class="monitor-id">
+                    <div class="hash">#</div>
+                    <div>{{ monitor.id }}</div>
+                </div>
+            </h1>
             <p v-if="monitor.description">{{ monitor.description }}</p>
-            <div class="tags">
+            <div class="d-flex">
-                <Tag v-for="tag in monitor.tags" :key="tag.id" :item="tag" :size="'sm'" />
+                <div class="tags">
+                    <Tag v-for="tag in monitor.tags" :key="tag.id" :item="tag" :size="'sm'" />
+                </div>
             </div>
             <p class="url">
                 <a v-if="monitor.type === 'http' || monitor.type === 'keyword' || monitor.type === 'json-query' || monitor.type === 'mp-health' " :href="monitor.url" target="_blank" rel="noopener noreferrer">{{ filterPassword(monitor.url) }}</a>
@@ -717,7 +725,7 @@ export default {
 }
 
 .word {
-    color: #aaa;
+    color: $secondary-text;
     font-size: 14px;
 }
 
@@ -731,7 +739,7 @@ table {
 
 .stats p {
     font-size: 13px;
-    color: #aaa;
+    color: $secondary-text;
 }
 
 .stats {
@@ -802,4 +810,20 @@ table {
     margin-left: 0 !important;
 }
 
+.monitor-id {
+    display: inline-flex;
+    font-size: 0.7em;
+    margin-left: 0.3em;
+    color: $secondary-text;
+    flex-direction: row;
+    flex-wrap: nowrap;
+
+    .hash {
+        user-select: none;
+    }
+
+    .dark & {
+        opacity: 0.7;
+    }
+}
 </style>

src/pages/ManageMaintenance.vue

@@ -53,7 +53,7 @@
                                 <font-awesome-icon icon="edit" /> {{ $t("Edit") }}
                             </router-link>
 
-                            <button class="btn btn-danger" @click="deleteDialog(item.id)">
+                            <button class="btn btn-normal text-danger" @click="deleteDialog(item.id)">
                                 <font-awesome-icon icon="trash" /> {{ $t("Delete") }}
                             </button>
                         </div>
@@ -294,8 +294,15 @@ export default {
             gap: 8px;
             flex-direction: row-reverse;
 
-            .btn-group {
+            @media (max-width: 550px) {
-                width: 310px;
+                & {
+                    width: 100%;
+                }
+
+                .btn-group {
+                    margin: 1em 1em 0 1em;
+                    width: 100%;
+                }
             }
         }
     }

src/pages/Settings.vue

@@ -245,7 +245,7 @@ export default {
 }
 
 footer {
-    color: #aaa;
+    color: $secondary-text;
     font-size: 13px;
     margin-top: 20px;
     padding-bottom: 30px;