disable selinux,fix end-to-end-test.sh error (#2934)

Signed-off-by: heyitao <heyitao@uniontech.com>
prometheus · Feb 23, 2024 · de5abec · de5abec
1 parent 3a02ab1
commit de5abec
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt
@@ -2933,7 +2933,6 @@ node_scrape_collector_success{collector="processes"} 1
 node_scrape_collector_success{collector="qdisc"} 1
 node_scrape_collector_success{collector="rapl"} 1
 node_scrape_collector_success{collector="schedstat"} 1
-node_scrape_collector_success{collector="selinux"} 1
 node_scrape_collector_success{collector="slabinfo"} 1
 node_scrape_collector_success{collector="sockstat"} 1
 node_scrape_collector_success{collector="softirqs"} 1
@@ -2951,9 +2950,6 @@ node_scrape_collector_success{collector="xfrm"} 1
 node_scrape_collector_success{collector="xfs"} 1
 node_scrape_collector_success{collector="zfs"} 1
 node_scrape_collector_success{collector="zoneinfo"} 1
-# HELP node_selinux_enabled SELinux is enabled, 1 is true, 0 is false
-# TYPE node_selinux_enabled gauge
-node_selinux_enabled 0
 # HELP node_slabinfo_active_objects The number of objects that are currently active (i.e., in use).
 # TYPE node_slabinfo_active_objects gauge
 node_slabinfo_active_objects{slab="dmaengine-unmap-128"} 1206

diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt
@@ -2955,7 +2955,6 @@ node_scrape_collector_success{collector="processes"} 1
 node_scrape_collector_success{collector="qdisc"} 1
 node_scrape_collector_success{collector="rapl"} 1
 node_scrape_collector_success{collector="schedstat"} 1
-node_scrape_collector_success{collector="selinux"} 1
 node_scrape_collector_success{collector="slabinfo"} 1
 node_scrape_collector_success{collector="sockstat"} 1
 node_scrape_collector_success{collector="softirqs"} 1
@@ -2973,9 +2972,6 @@ node_scrape_collector_success{collector="xfrm"} 1
 node_scrape_collector_success{collector="xfs"} 1
 node_scrape_collector_success{collector="zfs"} 1
 node_scrape_collector_success{collector="zoneinfo"} 1
-# HELP node_selinux_enabled SELinux is enabled, 1 is true, 0 is false
-# TYPE node_selinux_enabled gauge
-node_selinux_enabled 0
 # HELP node_slabinfo_active_objects The number of objects that are currently active (i.e., in use).
 # TYPE node_slabinfo_active_objects gauge
 node_slabinfo_active_objects{slab="dmaengine-unmap-128"} 1206

diff --git a/end-to-end-test.sh b/end-to-end-test.sh
@@ -40,7 +40,6 @@ enabled_collectors=$(cat << COLLECTORS
   qdisc
   rapl
   schedstat
-  selinux
   slabinfo
   sockstat
   softirqs
@@ -58,6 +57,7 @@ enabled_collectors=$(cat << COLLECTORS
 COLLECTORS
 )
 disabled_collectors=$(cat << COLLECTORS
+  selinux
   filesystem
   timex
   uname
@@ -182,10 +182,10 @@ trap finish EXIT
 get() {
   if command -v curl > /dev/null 2>&1
   then
-    curl -s -f "$@"
+    curl -s -f "$@" --noproxy 127.0.0.1
   elif command -v wget > /dev/null 2>&1
   then
-    wget -O - "$@"
+    wget -O - "$@" --no-proxy
   else
     echo "Neither curl nor wget found"
     exit 1