Add user management to dashboard

Sheridan · Sheridan · commit 9063727ea513 · 2025-10-09T01:12:38.000+03:00
Add VM batch init script for testing

Add ceph-exporter configuration

Move ceph and cephos settings to /cephos
diff --git a/live_build_config/hooks/normal/0300-metrics.chroot b/live_build_config/hooks/normal/0300-metrics.chroot
@@ -4,6 +4,7 @@ set -e
 
 systemctl disable prometheus-node-exporter.service
 systemctl disable telegraf.service
+systemctl disable ceph-exporter.service
 systemctl disable smartctl-exporter.service
 
 rm -rf /var/log/telegraf /etc/init.d/telegraf
diff --git a/live_build_config/hooks/normal/0400-clean-ceph.chroot b/live_build_config/hooks/normal/0400-clean-ceph.chroot
@@ -7,7 +7,12 @@ do
   systemctl disable $unit || true
 done
 
-for dr in "/etc/ceph" "/var/lib/ceph" "/var/log/ceph" "/var/run/ceph"
+for dr in "/etc/ceph" "/var/lib/ceph"
+do
+  rm -rf ${dr}
+done
+
+for dr in "/var/log/ceph" "/var/run/ceph"
 do
   rm -rf ${dr}/*
 done
diff --git a/live_build_config/includes.chroot_after_packages/etc/default/ceph-exporter b/live_build_config/includes.chroot_after_packages/etc/default/ceph-exporter
@@ -0,0 +1,5 @@
+# Set the command-line arguments to pass to the server.
+# Due to shell escaping, to pass backslashes for regexes, you need to double
+# them (\\d for \d). If running under systemd, you need to double them again
+# (\\\\d to mean \d), and escape newlines too.
+ARGS="--addrs :: --port 9106"
diff --git a/live_build_config/includes.chroot_after_packages/etc/default/telegraf b/live_build_config/includes.chroot_after_packages/etc/default/telegraf
@@ -2,4 +2,4 @@
 # Due to shell escaping, to pass backslashes for regexes, you need to double
 # them (\\d for \d). If running under systemd, you need to double them again
 # (\\\\d to mean \d), and escape newlines too.
-TELEGRAF_OPTS=""
+ARGS=""
diff --git a/live_build_config/includes.chroot_after_packages/etc/systemd/system/ceph-exporter.service b/live_build_config/includes.chroot_after_packages/etc/systemd/system/ceph-exporter.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Ceph cluster exporter daemon
+PartOf=ceph.target
+After=network-online.target local-fs.target
+Before=ceph.target
+Wants=network-online.target local-fs.target ceph.target ceph-mon.target
+
+[Service]
+EnvironmentFile=/etc/default/ceph-exporter
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStart=/usr/bin/ceph-exporter -f --id admin --setuser ceph --setgroup ceph $ARGS
+PrivateTmp=true
+Restart=on-failure
+RestartSec=10
+StartLimitBurst=3
+StartLimitInterval=30min
+StandardError=journal
+StandardOutput=journal
+SyslogIdentifier=ceph_exporter
+
+[Install]
+WantedBy=multi-user.target ceph.target
diff --git a/live_build_config/includes.chroot_after_packages/etc/systemd/system/telegraf.service b/live_build_config/includes.chroot_after_packages/etc/systemd/system/telegraf.service
@@ -8,12 +8,15 @@ Wants=network-online.target
 Type=notify
 EnvironmentFile=-/etc/default/telegraf
 User=telegraf
-ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d $TELEGRAF_OPTS
+ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d $ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 RestartForceExitStatus=SIGPIPE
 KillMode=control-group
 LimitMEMLOCK=8M:8M
+StandardError=journal
+StandardOutput=journal
+SyslogIdentifier=telegraf
 
 [Install]
 WantedBy=multi-user.target
diff --git a/live_build_config/includes.chroot_after_packages/usr/lib/systemd/system-environment-generators/10-ceph-environment.sh b/live_build_config/includes.chroot_after_packages/usr/lib/systemd/system-environment-generators/10-ceph-environment.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+. /usr/local/lib/cephos/base.sh.lib
+. /usr/local/lib/cephos/config.sh.lib
+. /usr/local/lib/cephos/cephos.sh.lib
+
+function apply_environment()
+{
+  echo "CLUSTER=ceph"
+  echo "CEPH_CLUSTER=ceph"
+  echo "CEPH_CONF='${ceph_main_conf}'"
+}
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-append-disk b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-append-disk
@@ -59,7 +59,7 @@ if [[ ! -f "${ceph_conf_dir}/ceph.client.bootstrap-osd.keyring" ]]
 then
   sudo ln -s ${ceph_data_dir}/bootstrap-osd/ceph.keyring ${ceph_conf_dir}/ceph.client.bootstrap-osd.keyring
 fi
-sudo ceph-volume \
+${sudo_ceph} ceph-volume \
     lvm create \
   --data "${block_device}" \
   --objectstore bluestore
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-cephfs-top b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-cephfs-top
@@ -4,4 +4,4 @@
 . /usr/local/lib/cephos/config.sh.lib
 . /usr/local/lib/cephos/cephos.sh.lib
 
-sudo cephfs-top --conffile ${ceph_main_conf} --cluster ceph --id admin
+${sudo_ceph} cephfs-top --conffile ${ceph_main_conf} --cluster ceph --id admin
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-connect-to-cluster b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-connect-to-cluster
@@ -115,7 +115,7 @@ spread_ssh_key "${user_home}" "${current_user}" "${cluster_node}"
 log_info "SSH key successfully copied to ${cluster_node}"
 
 create_directories
-copy_file_from_host "${cluster_node}" "${cephos_environment_location}/cluster.ini"
+copy_file_from_host "${cluster_node}" "${cephos_conf}/cluster.ini"
 copy_file_from_host "${cluster_node}" "${ceph_conf_dir}/ceph.conf"
 copy_file_from_host "${cluster_node}" "${ceph_conf_dir}/ceph.client.admin.keyring"
 copy_file_from_host "${cluster_node}" "${ceph_data_dir}/bootstrap-osd/ceph.keyring"
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-dashboard-user b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-dashboard-user
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+. /usr/local/lib/cephos/base.sh.lib
+. /usr/local/lib/cephos/config.sh.lib
+. /usr/local/lib/cephos/cephos.sh.lib
+. /usr/local/lib/cephos/blockdev.sh.lib
+
+read -r -d '' help_text <<EOF
+Usage: $0 -u <username> -p <password> -r <role>
+This script manage MGR dashboard users
+
+Options:
+  -u <user>     Specify the username (default: ${user})
+  -p <password> Specify the password
+  -r <role>     Specify the role (default: ${role})
+  -h            Show this help message
+  -v            Enable verbose output
+EOF
+set -euo pipefail
+
+# --- options parse ---
+pass=""
+user="cephos"
+role="administrator"
+while getopts ":u:p:r:hv" opt
+do
+  case ${opt} in
+    u) user="${OPTARG}" ;;
+    p) pass="${OPTARG}" ;;
+    r) role="${OPTARG}" ;;
+    h) echo "${help_text}"; exit 0 ;;
+    v) verbose=1 ;;
+   \?) wrong_opt "Error: unknown option -${OPTARG}" ;;
+    :) wrong_opt "Error: option -${OPTARG} requires an argument" ;;
+  esac
+done
+
+if [[ -z "$pass" ]]
+then
+  wrong_opt "Password not specified"
+fi
+# --- options parse ---
+# --- functions ---
+function manage_ceph_dashboard_user()
+{
+  local tempfile
+
+  tempfile=$(mktemp -u)
+  echo "${pass}" > "${tempfile}"
+  if dashboard_user_exists "$user"
+  then
+    log_verbose "User '${user}' exists. Changing password..."
+    ${sudo_ceph} ceph dashboard ac-user-set-password "${user}" -i "${tempfile}"
+    if [[ $? -eq 0 ]]
+    then
+      log_verbose "Password successfully changed."
+    else
+      rm -f "${tempfile}"
+      log_cry "Error changing password!"
+    fi
+  else
+    log_wrn "User '${user}' not found. Creating..."
+    ${sudo_ceph} ceph dashboard ac-user-create "${user}" -i "${tempfile}" "${role}"
+    if [[ $? -eq 0 ]]
+    then
+      log_verbose "User '${user}' successfully created with role '${role}'."
+    else
+      rm -f "${tempfile}"
+      log_cry "Error creating user!"
+    fi
+  fi
+  rm -f "${tempfile}"
+}
+# --- functions ---
+# --- main ---
+check_user "cephos"
+log_info "Changing password for ${user}:${role}"
+
+manage_ceph_dashboard_user
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-cephfs b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-cephfs
@@ -28,19 +28,19 @@ done
 check_user "cephos"
 
 log_info "Creating cephfs '${cephfs_name}' pools"
-sudo ceph osd pool create ${cephfs_name}_metadata
-sudo ceph osd pool set    ${cephfs_name}_metadata bulk false
-sudo ceph osd pool create ${cephfs_name}_data
-sudo ceph osd pool set    ${cephfs_name}_data     bulk true
+${sudo_ceph} ceph osd pool create ${cephfs_name}_metadata
+${sudo_ceph} ceph osd pool set    ${cephfs_name}_metadata bulk false
+${sudo_ceph} ceph osd pool create ${cephfs_name}_data
+${sudo_ceph} ceph osd pool set    ${cephfs_name}_data     bulk true
 
 log_info "Creating fs '${cephfs_name}'"
-sudo ceph fs new ${cephfs_name} ${cephfs_name}_metadata ${cephfs_name}_data
+${sudo_ceph} ceph fs new ${cephfs_name} ${cephfs_name}_metadata ${cephfs_name}_data
 
 log_info "Configure fs '${cephfs_name}'"
-ceph fs set ${cephfs_name} max_mds 1
-ceph fs set ${cephfs_name} standby_count_wanted 1
-ceph fs set ${cephfs_name} allow_standby_replay true
-ceph fs set ${cephfs_name} refuse_standby_for_another_fs false
+${sudo_ceph} ceph fs set ${cephfs_name} max_mds 1
+${sudo_ceph} ceph fs set ${cephfs_name} standby_count_wanted 1
+${sudo_ceph} ceph fs set ${cephfs_name} allow_standby_replay true
+${sudo_ceph} ceph fs set ${cephfs_name} refuse_standby_for_another_fs false
 
 set_fs_permissions
 
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-cluster b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-cluster
@@ -34,8 +34,8 @@ log_info "Init cluster with [fsid:${ceph_fsid}] and main conf file ${ceph_main_c
 create_directories
 
 log_verbose "Creating keys"
-sudo ceph-authtool --create-keyring ${ceph_conf_dir}/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mgr 'allow *' --cap mds 'allow *'
-sudo ceph-authtool --create-keyring ${ceph_data_dir}/bootstrap-osd/ceph.keyring --gen-key -n client.bootstrap-osd --cap mon 'profile bootstrap-osd' --cap mgr 'allow r'
+${sudo_ceph} ceph-authtool --create-keyring ${ceph_conf_dir}/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mgr 'allow *' --cap mds 'allow *'
+${sudo_ceph} ceph-authtool --create-keyring ${ceph_data_dir}/bootstrap-osd/ceph.keyring --gen-key -n client.bootstrap-osd --cap mon 'profile bootstrap-osd' --cap mgr 'allow r'
 
 log_verbose "Creating configuration ${ceph_main_conf}"
 add_mon_initial_member "$(hostname -s)"
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-host b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-host
@@ -84,14 +84,16 @@ fi
 # --- functions ---
 function restart_shell()
 {
-  local current_shell
-  current_shell=$(basename "${SHELL}")
-
-  log_verbose "Reinitializing shell ${current_shell}"
-  case "${current_shell}" in
-    bash) exec bash ;;
-     zsh) exec zsh ;;
-       *) log_cry "Unknown shell: ${current_shell}. Only bash and zsh are supported. Relogin to update hostname" ;;
+  local current_shell executable_name
+  current_shell=$(ps -p $$ -o comm=)
+  executable_name=$(basename "${current_shell}")
+
+  log_verbose "Reinitializing current shell: ${executable_name}"
+
+  case "${executable_name}" in
+    bash) source ~/.bashrc ;;
+     zsh) source ~/.zshrc ;;
+       *) log_cry "Unknown shell: ${executable_name}" ;;
   esac
 }
 
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-mds b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-mds
@@ -38,8 +38,8 @@ then
   sudo mkdir -p "${mds_data_dir}"
 
   log_info "Creating keys"
-  sudo ceph auth get-or-create mds.${mds_id} mon 'allow profile mds' mgr 'allow profile mds' osd 'allow rwx' mds 'allow *' -o ${mds_data_dir}/keyring
-  # sudo ceph auth get-or-create client.mds.${mds_id} mon 'allow rw' osd 'allow rwx' mds 'allow *' -o ${ceph_conf_dir}/client.mds.${mds_id}.keyring
+  ${sudo_ceph} ceph auth get-or-create mds.${mds_id} mon 'allow profile mds' mgr 'allow profile mds' osd 'allow rwx' mds 'allow *' -o ${mds_data_dir}/keyring
+  # ${sudo_ceph} ceph auth get-or-create client.mds.${mds_id} mon 'allow rw' osd 'allow rwx' mds 'allow *' -o ${ceph_conf_dir}/client.mds.${mds_id}.keyring
 
   set_fs_permissions
 
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-metrics b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-metrics
@@ -28,17 +28,20 @@ done
 # --- main ---
 check_user "cephos"
 
-log_info "Ceph internal metrics port: 9283"
-sudo ceph mgr module enable prometheus
-# sudo ceph config set mgr mgr/prometheus/server_addr "::"
-# sudo ceph config set mgr mgr/prometheus/server_port 9283
-sudo systemctl restart ceph-mgr@${mgr_id}.service
-
 log_info "Node exporter metrics port: 9100"
 manage_service_state "enable" "prometheus-node-exporter"
 
-log_info "Node exporter metrics port: 9102"
+log_info "Telegraf port: 9102"
 manage_service_state "enable" "telegraf"
 
 log_info "Smartctl exporter metrics port: 9104"
 manage_service_state "enable" "smartctl-exporter"
+
+log_info "Ceph exporter port: 9106"
+manage_service_state "enable" "ceph-exporter"
+
+log_info "Ceph internal metrics port: 9108"
+${sudo_ceph} ceph mgr module enable prometheus
+${sudo_ceph} ceph config set mgr mgr/prometheus/server_addr "::"
+${sudo_ceph} ceph config set mgr mgr/prometheus/server_port 9108
+sudo systemctl restart ceph-mgr@${mgr_id}.service
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-mgr b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-mgr
@@ -38,23 +38,26 @@ then
   sudo mkdir -p "${mgr_data_dir}"
 
   log_info "Creating keys"
-  sudo ceph auth get-or-create mgr.${mgr_id} mon 'allow profile mgr' osd 'allow *' mds 'allow *' -o ${mgr_data_dir}/keyring
+  ${sudo_ceph} ceph auth get-or-create mgr.${mgr_id} mon 'allow profile mgr' osd 'allow *' mds 'allow *' -o ${mgr_data_dir}/keyring
 
   set_fs_permissions
 
   manage_service_state "enable" "ceph-mgr@${mgr_id}"
   sleep 5
 
   log_info "Configuration"
-  sudo ceph mgr module enable dashboard
-  sudo ceph mgr module enable stats
-  sudo ceph config set mgr mgr/dashboard/server_port 8080
-  sudo ceph config set mgr mgr/dashboard/ssl false
-  echo 'P@ssw0rd' > /tmp/pass
-  sudo ceph dashboard ac-user-create cephos -i /tmp/pass administrator
-  rm -f /tmp/pass
-  sudo ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false
-  # sudo ceph restful create-self-signed-cert
+  ${sudo_ceph} ceph mgr module enable dashboard
+  ${sudo_ceph} ceph mgr module enable stats
+  ${sudo_ceph} ceph config set mgr mgr/dashboard/server_port 8080
+  ${sudo_ceph} ceph config set mgr mgr/dashboard/ssl false
+  ${sudo_ceph} ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false
+  # ${sudo_ceph} ceph restful create-self-signed-cert
+
+  if ! dashboard_user_exists "cephos"
+  then
+    log_info "Creating user 'cephos' with password 'P@ssw0rd'"
+    cephos-dashboard-user $(verbose_flag) -p 'P@ssw0rd'
+  fi
 else
   log_verbose "MGR already exists on this host"
 fi
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-mon b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-init-mon
@@ -41,16 +41,16 @@ then
   if [[ -z "${cluster_node}" ]]
   then
     log_verbose "Creating keys for mon"
-    sudo ceph-authtool --create-keyring ${ceph_conf_dir}/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'
-    sudo ceph-authtool ${ceph_conf_dir}/ceph.mon.keyring --import-keyring ${ceph_conf_dir}/ceph.client.admin.keyring
-    sudo ceph-authtool ${ceph_conf_dir}/ceph.mon.keyring --import-keyring ${ceph_data_dir}/bootstrap-osd/ceph.keyring
+    ${sudo_ceph} ceph-authtool --create-keyring ${ceph_conf_dir}/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'
+    ${sudo_ceph} ceph-authtool ${ceph_conf_dir}/ceph.mon.keyring --import-keyring ${ceph_conf_dir}/ceph.client.admin.keyring
+    ${sudo_ceph} ceph-authtool ${ceph_conf_dir}/ceph.mon.keyring --import-keyring ${ceph_data_dir}/bootstrap-osd/ceph.keyring
     log_info "Preparing map for ${mon_id}"
-    sudo monmaptool --create --add ${mon_id} ${public_ip} --fsid ${ceph_fsid} ${ceph_data_dir}/bootstrap-mon/monmap --enable-all-features
+    ${sudo_ceph} monmaptool --create --add ${mon_id} ${public_ip} --fsid ${ceph_fsid} ${ceph_data_dir}/bootstrap-mon/monmap --enable-all-features
   else
     log_info "Taking key from ${cluster_node} for ${mon_id}"
-    sudo ceph auth get mon. -o ${ceph_conf_dir}/ceph.mon.keyring
+    ${sudo_ceph} ceph auth get mon. -o ${ceph_conf_dir}/ceph.mon.keyring
     log_info "Taking map from ${cluster_node} for ${mon_id}"
-    sudo ceph mon getmap -o "${ceph_data_dir}/bootstrap-mon/monmap"
+    ${sudo_ceph} ceph mon getmap -o "${ceph_data_dir}/bootstrap-mon/monmap"
   fi
   set_fs_permissions
 
@@ -59,7 +59,7 @@ then
   set_fs_permissions
 
   log_info "Creating mon instance ${mon_id}"
-  sudo ceph-mon \
+  ${sudo_ceph} ceph-mon \
     --mkfs \
     -i "${mon_id}" \
     --monmap "${ceph_data_dir}/bootstrap-mon/monmap" \
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-setup-interface b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-setup-interface
@@ -203,7 +203,7 @@ fi
 if [[ -n "$new_interface_name" ]]
 then
   log_info "Network interface '${interface}' will be available as '${new_interface_name}' after reboot."
-  ask_confirmation "Reboot required. Reboot host?"
+  ask_confirmation "Reboot required. Reboot now?"
   log_wrn "Rebooting system..."
   sudo reboot
 fi
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-status b/live_build_config/includes.chroot_after_packages/usr/local/bin/cephos-status
@@ -34,7 +34,7 @@ function show()
   then
     log_delimiter
     log_info "${title} ($cmd)"
-    sudo $cmd
+    ${sudo_ceph} $cmd
   fi
 }
 # --- functions ---
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/lib/cephos/base.sh.lib b/live_build_config/includes.chroot_after_packages/usr/local/lib/cephos/base.sh.lib
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/lib/cephos/blockdev.sh.lib b/live_build_config/includes.chroot_after_packages/usr/local/lib/cephos/blockdev.sh.lib
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/lib/cephos/cephos.sh.lib b/live_build_config/includes.chroot_after_packages/usr/local/lib/cephos/cephos.sh.lib
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/lib/cephos/config.sh.lib b/live_build_config/includes.chroot_after_packages/usr/local/lib/cephos/config.sh.lib
diff --git a/live_build_config/includes.chroot_after_packages/usr/local/lib/cephos/network.sh.lib b/live_build_config/includes.chroot_after_packages/usr/local/lib/cephos/network.sh.lib
diff --git a/live_build_config/package-lists/tools.list.chroot b/live_build_config/package-lists/tools.list.chroot
diff --git a/testing/ENVIRONMENT.md b/testing/ENVIRONMENT.md
diff --git a/testing/init_vm.sh b/testing/init_vm.sh
diff --git a/tools/run_header.sh b/tools/run_header.sh
