Merge remote-tracking branch 'upstream/master'

plugins/dynamix/include/NotificationAgents.xml

@@ -89,45 +89,6 @@
       ]]>
     </Script>
   </Agent>
-  <Agent>
-    <Name>Notify My Android</Name>
-    <Variables>
-      <Variable Help="The API key can be found [a href='https://www.notifymyandroid.com/account.jsp' target='_blank'] [u]here[/u].[/a]" Desc="API key" Default="">API_KEY</Variable>
-      <Variable Help="Application name, e.g., Unraid Server." Desc="Application Name" Default="Unraid Server">APP_NAME</Variable>
-      <Variable Help="Specify the fields which are included in the title of the notification." Desc="Notification Title" Default="$SUBJECT">TITLE</Variable>
-      <Variable Help="Specify the fields which are included in the message body of the notification." Desc="Notification Message" Default="$DESCRIPTION">MESSAGE</Variable>
-    </Variables>
-    <Script>
-      <![CDATA[
-      #!/bin/bash
-      ##########
-      {0}
-      ##########
-      TITLE=$(echo -e "$TITLE")
-      MESSAGE=$(echo -e "$MESSAGE")
-
-      case "$IMPORTANCE" in
-      'normal' )
-      PRIORITY="0"
-      ;;
-      'warning' )
-      PRIORITY="1"
-      ;;
-      'alert' )
-      PRIORITY="2"
-      ;;
-      esac
-
-      curl -s -k \
-      -d "apikey=$API_KEY" \
-      -d "application=$APP_NAME" \
-      -d "event=$TITLE" \
-      -d "description=$MESSAGE" \
-      -d "priority=$PRIORITY" \
-      https://www.notifymyandroid.com/publicapi/notify 2>&1
-      ]]>
-    </Script>
-  </Agent>
   <Agent>
     <Name>Prowl</Name>
     <Variables>

plugins/dynamix/include/UpdateTwo.php

@@ -33,12 +33,8 @@ case 'vm':
   // initial cores/threads assignment
   $cores = $vcpus;
   $threads = 1;
-  $vendor = exec("grep -Pom1 '^vendor_id\\s+: \\K\\S+' /proc/cpuinfo");
-  if ($vendor == 'AuthenticAMD') {
-    $ht = 1; // force single threaded for AMD
-  } else {
-    $ht = exec("lscpu|grep -Po '^Thread\\(s\\) per core:\\s+\\K\\d+'") ?: 1; // fetch hyperthreading
-  }
+  $ht = exec("lscpu|grep -Po '^Thread\\(s\\) per core:\\s+\\K\\d+'") ?: 1; // fetch hyperthreading
+
   // adjust for hyperthreading
   if ($vcpus > $ht && $vcpus%$ht===0) {
     $cores /= $ht;