@misterhuydo/sentinel 1.0.26 → 1.0.28

package/.cairn/.hint-lock

@@ -1 +1 @@
-2026-03-21T19:49:49.891Z
+2026-03-21T20:21:02.908Z

package/.cairn/session.json

@@ -1,6 +1,6 @@
 {
-  "message": "Auto-checkpoint at 2026-03-21T20:00:24.443Z",
-  "checkpoint_at": "2026-03-21T20:00:24.444Z",
+  "message": "Auto-checkpoint at 2026-03-21T20:27:04.713Z",
+  "checkpoint_at": "2026-03-21T20:27:04.714Z",
   "active_files": [],
   "notes": [],
   "mtime_snapshot": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@misterhuydo/sentinel",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "Sentinel — Autonomous DevOps Agent installer and manager",
   "bin": {
     "sentinel": "./bin/sentinel.js"

package/python/scripts/fetch_log.sh

@@ -0,0 +1,201 @@
+#!/bin/bash
+# fetch_log.sh — Generic SSH log fetcher
+#
+# Usage:
+#   ./fetch_log.sh                          # reads all *.properties in script dir
+#   ./fetch_log.sh SSOLWA.properties        # specific file(s)
+#   ./fetch_log.sh SSOLWA.properties UAS.properties
+#   ./fetch_log.sh /path/to/SSOLWA.properties, /path/to/UAS.properties
+#
+# Properties file format:
+#   KEY=/path/to/ssh.pem                   (required)
+#   HOSTS=host1, ec2-user@host2, host3     (required, default user: ec2-user)
+#   LOGS=logs/app.log, logs/alarm.log      (required, backslash or forward slash)
+#   REMOTE_SERVICE_USER=MyService          (optional, defaults to properties filename)
+#   OUTPUT_DIR=/path/to/output             (optional, defaults to script dir)
+#   TAIL=200                               (optional, tail -n N)
+#   HEAD=100                               (optional, head -n N; ignored if TAIL set)
+#   GREP_FILTER=WARN|ERROR                 (optional, grep -E filter)
+#   GREP_EXCLUDE=SSLTool|CommandValidate   (optional, grep -iv exclude)
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+DEFAULT_SSH_USER="ec2-user"
+
+show_help() {
+  cat << 'EOF'
+fetch_log.sh — Generic SSH log fetcher
+
+USAGE
+  ./fetch_log.sh                              Read all *.properties in script dir
+  ./fetch_log.sh FILE.properties ...          One or more properties files
+  ./fetch_log.sh /path/A.properties, /path/B.properties
+
+OUTPUT
+  OUTPUT_DIR/<ServiceName>/<logname>-<node>.log
+  e.g.  SSOLWA/INN-SSOLWA-1.log, SSOLWA/INN-SSOLWA-2.log
+        UAS/UserAdminService-1.log
+
+PROPERTIES FILE FORMAT
+  Required:
+    KEY=/path/to/ssh.pem
+    HOSTS=host1, ec2-user@host2, host3
+    LOGS=logs/app.log, logs/alarm.log
+
+  Optional:
+    REMOTE_SERVICE_USER=MyService    Defaults to properties filename.
+                                     Log path resolves to /home/<REMOTE_SERVICE_USER>/<LOGS>
+    OUTPUT_DIR=/path/to/output       Defaults to script directory
+    TAIL=200                         Fetch last N lines  (tail -n N)
+    HEAD=100                         Fetch first N lines (head -n N); ignored if TAIL set
+    GREP_FILTER=WARN|ERROR           Keep only matching lines (grep -E)
+    GREP_EXCLUDE=SSLTool|hystrix     Exclude matching lines  (grep -iv)
+
+  Notes:
+    - HOSTS without user@ prefix default to ec2-user@<host>
+    - LOGS paths support both backslash and forward slash
+    - Lines starting with # are treated as comments
+
+EXAMPLE  (SSOLWA.properties)
+  KEY=/home/huy/.ssh/prod/sso-lwa.pem
+  HOSTS=ec2-1.eu-north-1.compute.amazonaws.com, ec2-2.eu-north-1.compute.amazonaws.com
+  LOGS=logs/INN-SSOLWA.log, logs/alarm.log
+  REMOTE_SERVICE_USER=SSOLoginWebApp
+  GREP_FILTER=WARN|ERROR
+  GREP_EXCLUDE=SSLTool|CommandValidate
+  TAIL=200
+EOF
+}
+
+if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
+  show_help
+  exit 0
+fi
+
+trim() {
+  local s="$*"
+  s="${s#"${s%%[![:space:]]*}"}"
+  s="${s%"${s##*[![:space:]]}"}"
+  printf '%s' "$s"
+}
+
+fetch_from_properties() {
+  local props_file="$1"
+  local KEY="" HOSTS="" LOGS="" TAIL="" HEAD=""
+  local OUTPUT_DIR="" REMOTE_SERVICE_USER="" GREP_FILTER="" GREP_EXCLUDE=""
+
+  while IFS='=' read -r raw_key raw_val || [[ -n "$raw_key" ]]; do
+    local k v
+    k="$(trim "$raw_key")"
+    v="$(trim "${raw_val:-}")"
+    v="${v%%\#*}"   # strip inline comments
+    v="$(trim "$v")"
+    [[ "$k" =~ ^[[:space:]]*# || -z "$k" ]] && continue
+    case "$k" in
+      KEY)                 KEY="$v" ;;
+      HOSTS)               HOSTS="$v" ;;
+      LOGS)                LOGS="$v" ;;
+      TAIL)                TAIL="$v" ;;
+      HEAD)                HEAD="$v" ;;
+      OUTPUT_DIR)          OUTPUT_DIR="$v" ;;
+      REMOTE_SERVICE_USER) REMOTE_SERVICE_USER="$v" ;;
+      GREP_FILTER)         GREP_FILTER="$v" ;;
+      GREP_EXCLUDE)        GREP_EXCLUDE="$v" ;;
+    esac
+  done < "$props_file"
+
+  if [[ -z "$KEY" || -z "$HOSTS" || -z "$LOGS" ]]; then
+    echo "SKIP: $props_file — missing required KEY, HOSTS, or LOGS"
+    return 0
+  fi
+
+  local SERVICE_NAME
+  SERVICE_NAME="$(basename "$props_file" .properties)"
+  REMOTE_SERVICE_USER="${REMOTE_SERVICE_USER:-$SERVICE_NAME}"
+  OUTPUT_DIR="${OUTPUT_DIR:-$SCRIPT_DIR}"
+
+  local SERVICE_DIR="$OUTPUT_DIR/$SERVICE_NAME"
+  mkdir -p "$SERVICE_DIR"
+
+  # Parse comma-separated hosts
+  IFS=',' read -ra HOST_ARRAY <<< "$HOSTS"
+  # Parse comma-separated log paths
+  IFS=',' read -ra LOG_ARRAY <<< "$LOGS"
+
+  local node_idx=1
+  for raw_host in "${HOST_ARRAY[@]}"; do
+    local host_entry ssh_user ssh_host
+    host_entry="$(trim "$raw_host")"
+    [[ -z "$host_entry" ]] && continue
+
+    if [[ "$host_entry" == *"@"* ]]; then
+      ssh_user="${host_entry%%@*}"
+      ssh_host="${host_entry##*@}"
+    else
+      ssh_user="$DEFAULT_SSH_USER"
+      ssh_host="$host_entry"
+    fi
+
+    echo "--- [$SERVICE_NAME] node-$node_idx ($ssh_host) ---"
+
+    for raw_log in "${LOG_ARRAY[@]}"; do
+      local log_path
+      log_path="$(trim "$raw_log")"
+      log_path="${log_path//\\//}"  # backslash → forward slash
+      log_path="${log_path#/}"      # strip leading slash
+
+      local remote_path="/home/$REMOTE_SERVICE_USER/$log_path"
+
+      # Build remote command
+      local remote_cmd="sudo cat $remote_path 2>/dev/null"
+      [[ -n "$GREP_FILTER" ]]  && remote_cmd+=" | grep -E '$GREP_FILTER'"
+      [[ -n "$GREP_EXCLUDE" ]] && remote_cmd+=" | grep -iv '$GREP_EXCLUDE'"
+      [[ -n "$TAIL" ]]         && remote_cmd+=" | tail -n $TAIL"
+      [[ -n "$HEAD" ]] && [[ -z "$TAIL" ]] && remote_cmd+=" | head -n $HEAD"
+
+      local log_basename dest
+      log_basename="$(basename "$log_path")"
+      log_basename="${log_basename%.*}"
+      dest="$SERVICE_DIR/${log_basename}-${node_idx}.log"
+
+      ssh -i "$KEY" -o StrictHostKeyChecking=no -o ConnectTimeout=10 \
+          -l "$ssh_user" "$ssh_host" "$remote_cmd" > "$dest" 2>/dev/null \
+        && echo "  OK:     $dest" \
+        || echo "  FAILED: $log_path on $ssh_host"
+    done
+
+    ((node_idx++))
+  done
+}
+
+# ── Collect properties files ──────────────────────────────────────────────────
+declare -a PROPS_FILES=()
+
+if [[ $# -eq 0 ]]; then
+  while IFS= read -r -d '' f; do
+    PROPS_FILES+=("$f")
+  done < <(find "$SCRIPT_DIR" -maxdepth 1 -name '*.properties' -print0 2>/dev/null | sort -z)
+else
+  for arg in "$@"; do
+    IFS=',' read -ra parts <<< "$arg"
+    for p in "${parts[@]}"; do
+      p="$(trim "$p")"
+      [[ -n "$p" ]] && PROPS_FILES+=("$p")
+    done
+  done
+fi
+
+if [[ ${#PROPS_FILES[@]} -eq 0 ]]; then
+  echo "No .properties files found."
+  exit 0
+fi
+
+for props in "${PROPS_FILES[@]}"; do
+  if [[ ! -f "$props" ]]; then
+    echo "SKIP: $props — file not found"
+    continue
+  fi
+  fetch_from_properties "$props"
+  echo ""
+done
+
+echo "Done."

package/python/sentinel/config_loader.py

@@ -115,7 +115,7 @@ class ConfigLoader:
         # Load workspace-level config first (~/sentinel/sentinel.properties),
         # then overlay per-project config so project values win.
         d: dict[str, str] = {}
-        workspace_props = self.config_dir.parent.parent / "sentinel.properties"
+        workspace_props = self.config_dir.resolve().parent.parent / "sentinel.properties"
         if workspace_props.exists():
             d.update(_parse_properties(str(workspace_props)))
             logger.debug("Loaded workspace config from %s", workspace_props)
@@ -159,6 +159,8 @@ class ConfigLoader:
             return
         self.log_sources = {}
         for path in sorted(sources_dir.glob("*.properties")):
+            if path.name.startswith("_"):
+                continue
             d = _parse_properties(str(path))
             s = LogSourceConfig()
             s.name = path.stem
@@ -181,6 +183,8 @@ class ConfigLoader:
             return
         self.repos = {}
         for path in sorted(repos_dir.glob("*.properties")):
+            if path.name.startswith("_"):
+                continue
             d = _parse_properties(str(path))
             r = RepoConfig()
             r.repo_name = path.stem