Skip to content

Commit

Permalink
Merge pull request #84 from GlobalNOC/1.7.1-dev
Browse files Browse the repository at this point in the history
1.7.1-2 Pull request
  • Loading branch information
ajragusa authored Feb 22, 2024
2 parents c698a37 + eec5f24 commit d337609
Show file tree
Hide file tree
Showing 102 changed files with 1,600 additions and 1,802 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
local/*
venv/*
dist/*
.vscode/*
!.vscode/launch.json
!.vscode/settings.json
!.vscode/
12 changes: 12 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## GRNOC TSDS Services 1.7.1 -- Feb 21 2024

### Features:
* Update MongoDB perl driver to 'v2.2.2'

### Bug Fixes:

* Removes deprecated "update" and "insert" MongoDB calls
* Moves venv library import to shebang to fix Authen bug
* Fixes verification memory leak caused by MongoDB perl driver list indexes call
* Fixes POST request memory leak caused by uploadinfo call inside GRNOC::WebService::Method

## GRNOC TSDS Services 1.7.0 --

### Features:
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = 1.7.0
VERSION = 1.7.1
NAME = grnoc-tsds-services

rpm: dist
Expand All @@ -15,8 +15,8 @@ dist: clean venv
cp -rv bin conf lib systemd www init.d CHANGES.md INSTALL.md venv $(NAME).spec dist/$(NAME)-$(VERSION)/
cd dist; tar -czvf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)/

test:
/usr/bin/perl -I lib/ t/TEST 1
test: venv
/usr/bin/perl -I lib/ -I venv/lib/perl5 t/TEST 1

venv:
carton install --path=venv
carton install --deployment --path=venv
5 changes: 1 addition & 4 deletions bin/tsds-change-required-metadata.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use Data::Dumper;
use GRNOC::Config;
use GRNOC::CLI;
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds-decom.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use GRNOC::Log;

use GRNOC::TSDS::MeasurementDecommer;
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_add_interface_addresses.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

# One time script to add interface_address metafield
# Adds interface_address as an array with interface_address.type, interface_address.mask, and interface_address.value

Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_add_meta_optical.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

# Script to add metadata fields to optical data

use GRNOC::Config;
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_add_meta_power.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

# One time script to add metafields for power
# Adds network, node_type, node_role, type, description, and alternate_intf fields

Expand Down
6 changes: 2 additions & 4 deletions bin/tsds_adjust_metafields.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5


use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

# One time fix to make field adjustments
# Deletes fields from tsds, drops the corresponding indexes and unsets them in the db
# Following fields will be removed by this script - pop.owner, pop.hands_and_eyes, pop.pop_id, pop.role, ...
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_expire.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use GRNOC::TSDS::Expire;
use JSON::XS;

Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_find_unsharded.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use Data::Dumper;
use Getopt::Long;

Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_firehose.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use JSON::XS;
use Net::AMQP::RabbitMQ;
use Net::RabbitMQ::Management::API;
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_fix_measurements.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use GRNOC::Config;

use MongoDB;
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_fix_start_date.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

# When migrating data from old snapp to tsds, first a new interface meta-data record ("measurement") is entered,
# which has 'start' = NOW.
Expand Down Expand Up @@ -32,9 +32,6 @@
use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use Data::Dumper;
use GRNOC::Log;
use Getopt::Long;
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_install.pl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

#--------------------------------------------------------------------
#----- GRNOC TSDS Installation/Bootstrap Script
Expand All @@ -13,9 +13,6 @@
use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use constant DEFAULT_CONFIG_FILE => '/etc/grnoc/tsds/services/config.xml';

use GRNOC::TSDS::Install;
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_meta.pl
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5
use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use Data::Dumper;
use Getopt::Long;

Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_search_indexer.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use Getopt::Long;
use Data::Dumper;
use GRNOC::TSDS::Parser; # including b/c Marpa will be a PITA otherwise
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_setup.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use Marpa::R2;
use Getopt::Long;
use Data::Dumper;
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_upgrade.pl
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use Marpa::R2;
use GRNOC::TSDS::Upgrade;
use Getopt::Long;
Expand Down
5 changes: 1 addition & 4 deletions bin/tsds_writer
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/perl -I /opt/grnoc/venv/grnoc-tsds-services/lib/perl5

use strict;
use warnings;

use lib '/opt/grnoc/venv/grnoc-tsds-services/lib/perl5';
use lib './venv/lib/perl5';

use GRNOC::TSDS::Writer;

use Getopt::Long;
Expand Down
77 changes: 39 additions & 38 deletions cpanfile
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
requires 'Cache::Memcached::Fast', '0.23';
requires 'Class::Accessor', '0.34';
requires 'Clone', '0.34';
requires 'Data::Compare', '1.29';
requires 'DateTime', '1.04';
requires 'DateTime::Format::Strptime', '1.54';
requires 'Env::C', '0.13';
requires 'File::Slurp', '9999.19';
requires 'Hash::Merge', '0.200';
requires 'HTML::Parser', '3.71';
requires 'JSON', '2.59';
requires 'JSON::XS', '3.01';
requires 'List::Flatten::Recursive', '0.103460';
requires 'List::MoreUtils', '0.33';
requires 'List::Util', '1.47';
requires 'LockFile::Simple', '0.208';
requires 'Marpa::R2', '3.000000';
requires 'Math::Round', '0.06';
requires 'MongoDB', 'v1.8.1';
requires 'Moo', '2.003000';
requires 'Net::AMQP::RabbitMQ', '2.30000';
requires 'Number::Format', '1.73';
requires 'Parallel::ForkManager', '1.18';
requires 'Proc::Daemon', '0.19';
requires 'Redis', '1.991';
requires 'Redis::DistLock', '0.07';
requires 'Sort::Versions', '1.5';
requires 'Statistics::LineFit', '0.06';
requires 'Test::Deep', '1.126';
requires 'Time::HiRes', '1.9725';
requires 'Tie::IxHash', '1.22';
requires 'Try::Tiny', '0.30';
requires 'Type::Tiny', '1.004002';
requires 'Types::XSD::Lite', '0.005';
requires 'WWW::Mechanize::PhantomJS', '0.14';
requires 'XML::Writer', '0.623';
requires 'CGI', '4.61';
requires 'XSLoader';
requires 'Cache::Memcached::Fast', '== 0.23';
requires 'CGI', '== 4.61';
requires 'Class::Accessor', '== 0.34';
requires 'Clone', '== 0.46';
requires 'Data::Compare', '== 1.29';
requires 'DateTime', '== 1.04';
requires 'DateTime::Format::Strptime', '== 1.54';
requires 'Env::C', '== 0.13';
requires 'File::Slurp', '== 9999.19';
requires 'Hash::Merge', '== 0.200';
requires 'HTML::Parser', '== 3.71';
requires 'JSON', '== 2.59';
requires 'JSON::XS', '== 3.01';
requires 'List::Flatten::Recursive', '== 0.103460';
requires 'List::MoreUtils', '== 0.428';
requires 'List::Util', '== 1.47';
requires 'LockFile::Simple', '== 0.208';
requires 'Marpa::R2', '== 3.000000';
requires 'Math::Round', '== 0.06';
requires 'MongoDB', '== v1.8.1';
requires 'MongoDB::BSON', '== v1.8.1';
requires 'Moo', '== 2.005005';
requires 'Net::AMQP::RabbitMQ', '== 2.30000';
requires 'Net::RabbitMQ::Management::API', '== 0.01';
requires 'Number::Format', '== 1.73';
requires 'Parallel::ForkManager', '== 1.18';
requires 'Proc::Daemon', '== 0.19';
requires 'Redis', '== 1.991';
requires 'Redis::DistLock', '== 0.07';
requires 'Sort::Versions', '== 1.5';
requires 'Statistics::LineFit', '== 0.06';
requires 'Test::Deep', '== 1.126';
requires 'Time::HiRes', '== 1.9758';
requires 'Tie::IxHash', '== 1.22';
requires 'Try::Tiny', '== 0.30';
requires 'Type::Tiny', '== 1.004002';
requires 'Types::XSD::Lite', '== 0.005';
requires 'WWW::Mechanize::PhantomJS', '== 0.14';
requires 'XML::Writer', '== 0.623';
Loading

0 comments on commit d337609

Please sign in to comment.