resolve merge conflict in argocd dashboard

Kept the version with the additional "Unhealthy Applications" panel
which provides better visibility into problematic applications.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

1 files changed, 0 insertions, 290 deletions

diff --git a/f3s/prometheus/manifests/argocd-applications-dashboard.yaml b/f3s/prometheus/manifests/argocd-applications-dashboard.yaml
index 0b747fb..5893fe5 100644
--- a/f3s/prometheus/manifests/argocd-applications-dashboard.yaml
+++ b/f3s/prometheus/manifests/argocd-applications-dashboard.yaml
@@ -193,295 +193,6 @@ data:
           }
         },
         {
-<<<<<<< HEAD
-          "id": 5,
-          "gridPos": {
-            "h": 8,
-            "w": 24,
-            "x": 0,
-            "y": 4
-          },
-          "type": "table",
-          "title": "Application Status Overview",
-          "targets": [
-            {
-              "expr": "argocd_app_info",
-              "refId": "A",
-              "format": "table",
-              "instant": true
-            }
-          ],
-          "transformations": [
-            {
-              "id": "organize",
-              "options": {
-                "excludeByName": {
-                  "Time": true,
-                  "__name__": true,
-                  "Value": true,
-                  "instance": true,
-                  "job": true,
-                  "namespace": true,
-                  "pod": true,
-                  "repo": true,
-                  "dest_server": true
-                },
-                "renameByName": {
-                  "name": "Application",
-                  "health_status": "Health",
-                  "sync_status": "Sync Status",
-                  "dest_namespace": "Namespace",
-                  "project": "Project"
-                }
-              }
-            }
-          ],
-          "options": {
-            "showHeader": true,
-            "sortBy": [
-              {
-                "desc": false,
-                "displayName": "Application"
-              }
-            ]
-          },
-          "fieldConfig": {
-            "overrides": [
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Health"
-                },
-                "properties": [
-                  {
-                    "id": "custom.cellOptions",
-                    "value": {
-                      "type": "color-background"
-                    }
-                  },
-                  {
-                    "id": "mappings",
-                    "value": [
-                      {
-                        "type": "value",
-                        "options": {
-                          "Healthy": {
-                            "color": "green",
-                            "text": "✓ Healthy"
-                          },
-                          "Progressing": {
-                            "color": "yellow",
-                            "text": "⟳ Progressing"
-                          },
-                          "Degraded": {
-                            "color": "red",
-                            "text": "✗ Degraded"
-                          },
-                          "Suspended": {
-                            "color": "orange",
-                            "text": "⏸ Suspended"
-                          },
-                          "Missing": {
-                            "color": "red",
-                            "text": "? Missing"
-                          },
-                          "Unknown": {
-                            "color": "gray",
-                            "text": "? Unknown"
-                          }
-                        }
-                      }
-                    ]
-                  }
-                ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Sync Status"
-                },
-                "properties": [
-                  {
-                    "id": "custom.cellOptions",
-                    "value": {
-                      "type": "color-background"
-                    }
-                  },
-                  {
-                    "id": "mappings",
-                    "value": [
-                      {
-                        "type": "value",
-                        "options": {
-                          "Synced": {
-                            "color": "green",
-                            "text": "✓ Synced"
-                          },
-                          "OutOfSync": {
-                            "color": "yellow",
-                            "text": "⚠ Out of Sync"
-                          },
-                          "Unknown": {
-                            "color": "gray",
-                            "text": "? Unknown"
-                          }
-                        }
-                      }
-                    ]
-                  }
-                ]
-              }
-            ]
-          }
-        },
-        {
-          "id": 6,
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 0,
-            "y": 12
-          },
-          "type": "timeseries",
-          "title": "Application Health Status Over Time",
-          "targets": [
-            {
-              "expr": "count(argocd_app_info{health_status=\"Healthy\"})",
-              "legendFormat": "Healthy",
-              "refId": "A"
-            },
-            {
-              "expr": "count(argocd_app_info{health_status=\"Progressing\"})",
-              "legendFormat": "Progressing",
-              "refId": "B"
-            },
-            {
-              "expr": "count(argocd_app_info{health_status=\"Degraded\"})",
-              "legendFormat": "Degraded",
-              "refId": "C"
-            },
-            {
-              "expr": "count(argocd_app_info{health_status=~\"Suspended|Missing|Unknown\"})",
-              "legendFormat": "Other (Suspended/Missing/Unknown)",
-              "refId": "D"
-            }
-          ],
-          "fieldConfig": {
-            "defaults": {
-              "custom": {
-                "fillOpacity": 10,
-                "showPoints": "never",
-                "spanNulls": true
-              },
-              "color": {
-                "mode": "palette-classic"
-              }
-            },
-            "overrides": [
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Healthy"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "green",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Degraded"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "red",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "Progressing"
-                },
-                "properties": [
-                  {
-                    "id": "color",
-                    "value": {
-                      "fixedColor": "yellow",
-                      "mode": "fixed"
-                    }
-                  }
-                ]
-              }
-            ]
-          },
-          "options": {
-            "legend": {
-              "displayMode": "list",
-              "placement": "bottom"
-            },
-            "tooltip": {
-              "mode": "multi"
-            }
-          }
-        },
-        {
-          "id": 7,
-          "gridPos": {
-            "h": 8,
-            "w": 12,
-            "x": 12,
-            "y": 12
-          },
-          "type": "timeseries",
-          "title": "Sync Operations",
-          "targets": [
-            {
-              "expr": "rate(argocd_app_sync_total{phase=\"Succeeded\"}[5m])",
-              "legendFormat": "{{name}} - Succeeded",
-              "refId": "A"
-            },
-            {
-              "expr": "rate(argocd_app_sync_total{phase=\"Error\"}[5m])",
-              "legendFormat": "{{name}} - Failed",
-              "refId": "B"
-            }
-          ],
-          "fieldConfig": {
-            "defaults": {
-              "custom": {
-                "fillOpacity": 10,
-                "showPoints": "never"
-              },
-              "unit": "ops"
-            }
-          },
-          "options": {
-            "legend": {
-              "displayMode": "list",
-              "placement": "bottom"
-            }
-          }
-        },
-        {
-          "id": 8,
-          "gridPos": {
-            "h": 6,
-            "w": 24,
-            "x": 0,
-            "y": 20
-||||||| 7b4d629
-=======
           "id": 9,
           "gridPos": {
             "h": 6,
@@ -879,7 +590,6 @@ data:
             "w": 24,
             "x": 0,
             "y": 26
->>>>>>> 529caf525d3c8594bcf0208697629827113dc1fc
           },
           "type": "alertlist",
           "title": "Active Alerts",