Thanks, Git

Author: sandersjds

prtgshell2.cs

@@ -31,9 +31,18 @@ function Get-PrtgObject {
 
 		$DeviceType = $Data.prtg.sensortree.nodes.SelectNodes("*[1]").LocalName
 
-		return $Data.prtg.sensortree.nodes.SelectNodes("*[1]")
+		$ObjectXMLData = $Data.prtg.sensortree.nodes.SelectNodes("*[1]")
 
-		$ReturnData = @()
+		
+		####
+		$TestReturn = "" | select type,data
+		$TestReturn.type = $DeviceType
+		$TestReturn.data = $ObjectXMLData
+		
+		return $TestReturn
+		####
+		
+		#$ReturnData = @()
 
 		<#
 		
@@ -46,7 +55,7 @@ function Get-PrtgObject {
 		
 		#>
 
-		$PrtgObjectType = switch ($Content) {
+		$PrtgObjectType = switch ($DeviceType) {
 			"probes"	{ "PrtgShell.PrtgProbe" }
 			"groups"	{ "PrtgShell.PrtgGroup" }
 			"devices"	{ "PrtgShell.PrtgDevice" }
@@ -58,12 +67,18 @@ function Get-PrtgObject {
 			"history"	{ "PrtgShell.PrtgHistory" }
 		}
 
+		$ObjectXMLData = $Data.prtg.sensortree.nodes.SelectNodes("*[1]")
 
+		$ThisObject = New-Object $PrtgObjectType
+		
+		foreach ($p in $ObjectXMLData.GetEnumerator()) {
+			$ThisObject.($p.name) = $p.'#Text'
+		}
 
+		return $ThisObject
 
-		foreach ($item in $Data.$Content.item) {
-			$ThisObject = New-Object $PrtgObjectType
-			#$ThisRow = "" | Select-Object $SelectedColumns
+		<#
+		#$ThisRow = "" | Select-Object $SelectedColumns
 			foreach ($Prop in $SelectedColumns) {
 				if ($Content -eq "channels" -and $Prop -eq "lastvalue_raw") {
 					# fix a bizarre formatting bug
@@ -97,5 +112,8 @@ function Get-PrtgObject {
 		} else {
 			return $ReturnData
 		}
+		
+		#>
+		
 	}
 }

prtgshell2.dll

@@ -49,8 +49,6 @@ function Get-PrtgSensorHistoricData {
 		$QueryObject = $PrtgServerObject.HttpQuery($url,$false)
 
 		$DataPoints = $QueryObject.RawData | ConvertFrom-Csv | ? { $_.'Date Time' -ne 'Averages' }
-		
-		#$APropertyName = (($DataPoints | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty Name) -notmatch "Coverage") -notmatch "Date Time" | Select-Object -First 1
 	}
 
 	END {

prtgshell2.psd1

@@ -41,6 +41,8 @@ function Get-PrtgSensorUptime {
     }
 
     PROCESS {
+		$ObjectInterval = Get-PrtgObject $SensorId | Select-Object -ExpandProperty interval
+		
 		$HistoricData = Get-PrtgSensorHistoricData $SensorId $RangeStart $RangeEnd 0
 
 		$APropertyName = (($HistoricData | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty Name) -notmatch "Coverage") -notmatch "Date Time" | Select-Object -First 1
@@ -51,14 +53,19 @@ function Get-PrtgSensorUptime {
 	}
 
 	END {
-		$returnobject = "" | select SensorId,RangeStart,RangeEnd,TotalDatapoints,UpDatapoints,DownDatapoints,UptimePercentage
+		$returnobject = "" | select SensorId,RangeStart,RangeEnd,TotalDatapoints,UpDatapoints,DownDatapoints,Interval,UptimePercentage
 		$returnobject.SensorId = $SensorId
 		$returnobject.RangeStart = $RangeStart
 		$returnobject.RangeEnd = $RangeEnd
 		$returnobject.TotalDatapoints = $HistoricData.Count
 		$returnobject.UpDatapoints = $UpEntries.Count
 		$returnobject.DownDatapoints = $HistoricData.Count - $UpEntries.Count
-		$returnobject.UptimePercentage = ($UpEntries.Count / $HistoricData.Count) * 100
+		$returnobject.Interval = $ObjectInterval
+		if ($HistoricData.Count) {
+			$returnobject.UptimePercentage = ($UpEntries.Count / $HistoricData.Count) * 100
+		} else { 
+			$returnobject.UptimePercentage = 0
+		}
 
 		return $returnobject
     }

prtgshell2.psm1

@@ -41,6 +41,7 @@ function Get-PrtgTableData {
 			Returns the messages log for device 1002.
 	#>
 
+	[CmdletBinding()]
 	Param (		
 		[Parameter(Mandatory=$True,Position=0)]
 		[ValidateSet("probes","groups","devices","sensors","todos","messages","values","channels","history")]
@@ -56,8 +57,14 @@ function Get-PrtgTableData {
 		[string[]]$FilterTags,
 
 		[Parameter(Mandatory=$False)]
-		#[ValidateSet("Unknown","Collecting","Up","Warning","Down","NoProbe","PausedbyUser","PausedbyDependency","PausedbySchedule","Unusual","PausedbyLicense","PausedUntil","DownAcknowledged","DownPartial")]
+		[ValidateSet("Unknown","Collecting","Up","Warning","Down","NoProbe","PausedbyUser","PausedbyDependency","PausedbySchedule","Unusual","PausedbyLicense","PausedUntil","DownAcknowledged","DownPartial")]
 		[string[]]$FilterStatus,
+		
+		[Parameter(Mandatory=$False)]
+		[string]$FilterTarget,
+		
+		[Parameter(Mandatory=$False)]
+		[string]$FilterValue,
 
 		[Parameter(Mandatory=$False)]
 		[int]$Count,
@@ -73,12 +80,12 @@ function Get-PrtgTableData {
 		sortby = sorts on named column, ascending (or decending with a leading "-")
 		filter_xyz - fulltext filtering. this is a feature in its own right
 	
+	
+		
 	#>
 
 	BEGIN {
 		$PRTG = $Global:PrtgServerObject
-		if ($PRTG.Protocol -eq "https") { $PRTG.OverrideValidation() }
-
 
 		$CountProperty = @{}
 		$FilterProperty = @{}
@@ -94,10 +101,38 @@ function Get-PrtgTableData {
 			$FilterProperty += @{ "filter_tags" = $FilterTags }
 		}
 
+		$StatusFilterCodes = @{
+			"Unknown" = 1
+			"Collecting" = 2
+			"Up" = 3
+			"Warning" = 4
+			"Down" = 5
+			"NoProbe" = 6
+			"PausedbyUser" = 7
+			"PausedbyDependency" = 8
+			"PausedbySchedule" = 9
+			"Unusual" = 10
+			"PausedbyLicense" = 11
+			"PausedUntil" = 12
+			"DownAcknowledged" = 13
+			"DownPartial" = 14
+		}
+		
 		if ($FilterStatus -and (!($Content -eq "sensors"))) {
 			throw "Get-PrtgTableData: Parameter FilterStatus requires content type sensors"
 		} elseif ($Content -eq "sensors" -and $FilterStatus) {
-			$FilterProperty += @{ "filter_status" = $FilterStatus }
+			# I apparently wrote some code that gracefully
+			# handles this (multiple properties w/ same name) two years ago.
+			# good job, past josh
+			$FilterProperty += @{ "filter_status" = $StatusFilterCodes[$FilterStatus] }
+		}
+		
+		if ($FilterTarget) {
+			if (!$FilterValue) {
+				throw "Get-PrtgTableData: Parameter FilterTarget requires parameter FilterValue also"
+			}
+			$FilterName = "filter_" + $FilterTarget
+			$FilterProperty += @{ $FilterName = $FilterValue }
 		}
 
 		if (!$Columns) {
@@ -153,11 +188,11 @@ function Get-PrtgTableData {
 		##### data returned; do!
 
 		if ($Raw) {
-			$QueryObject = HelperHTTPQuery $url
+			$QueryObject = $PrtgServerObject.HttpQuery($url,$false)
 			return $QueryObject.Data
 		}
 
-		$QueryObject = HelperHTTPQuery $url -AsXML
+		$QueryObject = $PrtgServerObject.HttpQuery($url)
 		$Data = $QueryObject.Data
 
 		$ReturnData = @()

src/cmdlets/Get-PrtgObject.ps1

@@ -114,6 +114,7 @@ public string UrlBuilder(string Action) {
             return CompletedString;
         }
 
+		// i'm not confident that this is actually used anywhere
         public string UrlBuilder(string Action, string[] QueryParameters) {
 
             if (Action.StartsWith("/")) Action = Action.Substring(1);
@@ -143,6 +144,10 @@ public string UrlBuilder(string Action, Hashtable QueryParameters) {
             Pieces[2] = "?";
             Pieces[3] = this.AuthString;
 
+			// this little bit of awesome handles query string parameters that
+			// have multiple entries with the same key name, which obviously
+			// hashtables do not natively support. this detects values that are
+			// not singleton strings or ints, and blows up the array.
             foreach (DictionaryEntry KeyPair in QueryParameters) {
                 if (KeyPair.Value.GetType() == typeof(string) || KeyPair.Value.GetType() == typeof(int)) {
                     Pieces[4] += ("&" + KeyPair.Key + "=" + KeyPair.Value);
@@ -166,7 +171,7 @@ private static bool OnValidateCertificate(object sender, X509Certificate certifi
         public void OverrideValidation() {
             ServicePointManager.ServerCertificateValidationCallback = OnValidateCertificate;
             ServicePointManager.Expect100Continue = true;
-            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Ssl3;
         }
 
         private System.Uri prtguri;