Fix remaining spam issues and phpcs merge conflict marker

Spam fixes:
- Add ZFS pool category to hash with subtypes (pool_state, pool_usage,
  pool_errors) so DEGRADED and usage-high on same pool get separate tickets
- Strip volatile percentages from LXC/ZFS usage titles ("usage high: 80.1%"
  → "usage high") and OSD counts from BlueStore slow-ops titles
  ("2 OSD(s) experiencing" → "OSD(s) experiencing") in hwmonDaemon.py

phpcs fix:
- Remove leftover merge conflict marker (<<<<<<< HEAD / >>>>>>>)
  in create_ticket_api.php which caused phpcs to fail on bitshift
  operator spacing

DB cleanup:
- Deleted 107 spam comments and 107 audit entries from tickets
  357934698 (ZFS pool), 673679581 (BlueStore), 925498317 (LXC storage)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

create_ticket_api.php

@@ -129,6 +129,21 @@ function generateTicketHash($data)
 
     if (stripos($title, 'SMART issues') !== false) {
         $issueCategory = 'smart';
+    } elseif (stripos($title, 'ZFS pool') !== false) {
+        $issueCategory = 'zfs';
+        // Extract pool name so each pool gets its own ticket
+        if (preg_match("/ZFS pool '([^']+)'/i", $title, $poolMatch)) {
+            $poolName = strtolower(preg_replace('/[^a-z0-9_]/i', '_', $poolMatch[1]));
+            if (stripos($title, 'state:') !== false || preg_match('/DEGRADED|FAULTED|UNAVAIL|OFFLINE/i', $title)) {
+                $issueSubtype = 'pool_state_' . $poolName;
+            } elseif (stripos($title, 'usage') !== false) {
+                $issueSubtype = 'pool_usage_' . $poolName;
+            } elseif (stripos($title, 'errors') !== false) {
+                $issueSubtype = 'pool_errors_' . $poolName;
+            } else {
+                $issueSubtype = 'pool_' . $poolName;
+            }
+        }
     } elseif (stripos($title, 'LXC') !== false || stripos($title, 'storage usage') !== false) {
         $issueCategory = 'storage';
         // Include the LXC container ID so each container gets its own ticket
@@ -228,12 +243,7 @@ if ($existing) {
 
     if ($existingStatus !== 'Closed') {
         // Ticket is still active — update title, escalate priority, and refresh
-<<<<<<< HEAD
-        // the description with the latest sensor data if the new report is more severe
-        // (lower priority number = higher severity).
-=======
         // description with latest sensor data.
->>>>>>> development
         $changes   = [];
         $updateSql = "UPDATE tickets SET updated_at = NOW(), updated_by = ?";
         $bindTypes = "i";
@@ -271,20 +281,10 @@ if ($existing) {
             $updStmt->execute();
             $updStmt->close();
 
-            // Only add a comment when something meaningful changed (not just a description refresh)
-            $meaningfulChanges = array_diff_key($changes, ['description_refreshed' => true]);
-            if (!empty($meaningfulChanges)) {
-                $changeLines = [];
-                if (isset($changes['title'])) {
-                    $changeLines[] = "- **Title updated** to reflect current issue";
-                }
-                if (isset($changes['priority'])) {
-                    $changeLines[] = "- **Priority escalated** from P{$changes['priority']['from']} to P{$changes['priority']['to']}";
-                }
-                // Wrap description in a fenced code block so ASCII art / box-drawing
-                // characters render correctly instead of collapsing into a paragraph blob
-                $commentText = "**hwmonDaemon reported a worsened condition — ticket updated automatically.**\n\n" .
-                               implode("\n", $changeLines) . "\n\nLatest report:\n\n```\n" . $description . "\n```";
+            // Only post a comment on priority escalation — title and description updates
+            // are silent (title changes like rising counters would spam a comment every run)
+            if (isset($changes['priority'])) {
+                $commentText = "**hwmonDaemon escalated this ticket from P{$changes['priority']['from']} to P{$changes['priority']['to']}.**\n\n```\n" . $description . "\n```";
                 $commentStmt = $conn->prepare(
                     "INSERT INTO ticket_comments (ticket_id, user_id, user_name, comment_text, markdown_enabled) VALUES (?, ?, 'hwmonDaemon', ?, 1)"
                 );