fixes #26

Author: ghostsquad

Functions/Internal.ps1

@@ -1,99 +1,3 @@
-function Convert-TimeZone
-{
-    <#
-        .Synopsis
-           Coverts from a given time zone to the specified time zone.
-
-        .Description
-            Coverts from a given time zone to the specified time zone.
-
-        .Parameter DateTime
-            A DateTime object will be converted to the new time zone.
-
-        .Parameter ToTimeZone
-            The name of the target time zone you wish to convert to. You can get the names by using the -ListTimeZones parameter.
-
-        .Parameter ListTimeZones
-            Lists all the time zones that can be used.
-
-        .Example
-            Convert-TimeZone -ListTimeZones
-
-            Id                         : Dateline Standard Time
-            DisplayName                : (UTC-12:00) International Date Line West
-            StandardName               : Dateline Standard Time
-            DaylightName               : Dateline Daylight Time
-            BaseUtcOffset              : -12:00:00
-            SupportsDaylightSavingTime : False
-
-            Id                         : UTC-11
-            DisplayName                : (UTC-11:00) Coordinated Universal Time-11
-            StandardName               : UTC-11
-            DaylightName               : UTC-11
-            BaseUtcOffset              : -11:00:00
-            SupportsDaylightSavingTime : False
-
-            Lists available time zones to convert to.
-
-        .Example
-            Convert-TimeZone -DateTime (Get-Date) -ToTimeZone UTC
-
-            Converts current time to UTC time.
-
-        .Notes
-            NAME:      Convert-TimeZone
-            AUTHOR:    Matthew Hodgkins
-            WEBSITE:   http://www.hodgkins.net.au
-
-    #>
-
-    param
-    (
-        [CmdletBinding(DefaultParametersetName = 'Convert Time Zone')]
-
-        [Parameter(Mandatory = $true,
-                   ParameterSetName = 'Convert Time Zone')]
-        [ValidateNotNull()]
-        [ValidateNotNullOrEmpty()]
-        [datetime]$DateTime,
-
-        [Parameter(Mandatory = $true,
-                   ParameterSetName = 'Convert Time Zone')]
-        [ValidateNotNull()]
-        [ValidateNotNullOrEmpty()]
-        [string]$ToTimeZone,
-
-        [Parameter(Mandatory = $false,
-                   ParameterSetName = 'List Time Zones')]
-        [switch]$ListTimeZones
-    )
-
-    # Loading dll for Windows 2003 R2
-    [void][System.Reflection.Assembly]::LoadWithPartialName('System.Core')
-
-    # List TimeZones for the user
-    if ($ListTimeZones)
-    {
-        [System.TimeZoneInfo]::GetSystemTimeZones()
-        return
-    }
-
-    # Run the Function
-    else
-    {
-        $TimeZoneObject = [System.TimeZoneInfo]::FindSystemTimeZoneById($ToTimeZone)
-        $TargetZoneTime = [System.TimeZoneInfo]::ConvertTime($DateTime, $TimeZoneObject)
-        $OutObject = New-Object -TypeName PSObject -Property @{
-            LocalTime = $DateTime
-            LocalTimeZone = $(([System.TimeZoneInfo]::LOCAL).id)
-            TargetTime = $TargetZoneTime
-            TargetTimeZone = $($TimeZoneObject.id)
-        }
-
-        Write-Output $OutObject
-    }
-}
-
 Function Import-XMLConfig
 {
 <#
@@ -135,9 +39,6 @@ Function Import-XMLConfig
     #Get Metric Send Interval From Config
     [int]$Config.MetricSendIntervalSeconds = $xmlfile.Configuration.Graphite.MetricSendIntervalSeconds
 
-    # Get the Timezone Of the Graphite Server
-    $Config.TimeZoneOfGraphiteServer = $xmlfile.Configuration.Graphite.TimeZoneOfGraphiteServer
-
     # Convert Value in Configuration File to Bool for Sending via UDP
     [bool]$Config.SendUsingUDP = [System.Convert]::ToBoolean($xmlfile.Configuration.Graphite.SendUsingUDP)
 

Functions/Send-BulkGraphiteMetrics.ps1

@@ -70,7 +70,7 @@ function Send-BulkGraphiteMetrics
     if ($DateTime)
     {
         # Convert to a Unix time without any rounding
-        $UnixTime = (Get-Date $DateTime -UFormat %s) -Replace ("[,\.]\d*", "")
+        $UnixTime = [uint64]$DateTime.ToUniversalTime()
     }
 
     # Create Send-To-Graphite Metric

Functions/Send-GraphiteMetric.ps1

@@ -77,7 +77,7 @@ function Send-GraphiteMetric
     if ($DateTime)
     {
         # Convert to a Unix time without any rounding
-        $UnixTime = (Get-Date $DateTime -UFormat %s) -Replace ("[,\.]\d*", "")
+        $UnixTime = [uint64]$DateTime.ToUniversalTime()
     }
 
     # Create Send-To-Graphite Metric

Functions/Start-StatsToGraphite.ps1

@@ -106,14 +106,10 @@ Function Start-StatsToGraphite
         # Used to track execution time
         $iterationStopWatch = [System.Diagnostics.Stopwatch]::StartNew()
 
-        # Convert To The TimeZone of the Graphite Server
-        $convertedTime = Convert-TimeZone -DateTime (Get-Date -Format s) -ToTimeZone $Config.TimeZoneOfGraphiteServer
-
-        # Get the TargetTime Part of the Script
-        $convertedTime = $convertedTime.TargetTime
+        $nowUtc = [datetime]::UtcNow
 
         # Round Time to Nearest Time Period
-        $convertedTime = $convertedTime.AddSeconds(- ($convertedTime.Second % $Config.MetricSendIntervalSeconds))
+        $nowUtc = $nowUtc.AddSeconds(- ($nowUtc.Second % $Config.MetricSendIntervalSeconds))
 
         $metricsToSend = @{}
 
@@ -218,7 +214,7 @@ Function Start-StatsToGraphite
             "CarbonServer" = $Config.CarbonServer
             "CarbonServerPort" = $Config.CarbonServerPort
             "Metrics" = $metricsToSend
-            "DateTime" = $convertedTime
+            "DateTime" = $nowUtc
             "UDP" = $Config.SendUsingUDP
             "Verbose" = $Config.ShowOutput
             "TestMode" = $TestMode

StatsToGraphiteConfig.xml

@@ -5,7 +5,6 @@
         <CarbonServerPort>2003</CarbonServerPort>
         <MetricPath>datacenter1.servers</MetricPath>
         <MetricSendIntervalSeconds>5</MetricSendIntervalSeconds>
-        <TimeZoneOfGraphiteServer>UTC</TimeZoneOfGraphiteServer>
         <SendUsingUDP>False</SendUsingUDP>
     </Graphite>
     <PerformanceCounters>