Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sort plugins on packaging files. #963

Merged
merged 2 commits into from Dec 14, 2022
Merged

sort plugins on packaging files. #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b959b9
apply current plugins.
yseto Dec 13, 2022
eff160b
apply sort on update-docs.pl
yseto Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packaging/deb-v2/debian/rules
View file
Open in desktop
Expand Up @@ -10,6 +10,6 @@ override_dh_auto_install:
dh_auto_install
install -d -m 755 debian/${package}/usr/bin
install -m 755 debian/mackerel-plugin debian/${package}/usr/bin/mackerel-plugin
for i in accesslog apache2 aws-dynamodb aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-ses aws-s3-requests conntrack elasticsearch flume gostats graphite haproxy jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx nvidia-smi openldap php-apc php-fpm php-opcache plack postgres proc-fd solr rabbitmq redis sidekiq snmp squid td-table-count trafficserver twemproxy uwsgi-vassal varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode h2o; do \
for i in accesslog apache2 aws-cloudfront aws-dynamodb aws-ec2-cpucredit aws-ec2-ebs aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-s3-requests aws-ses conntrack docker elasticsearch fluentd gostats h2o haproxy inode jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd rabbitmq redis sidekiq snmp solr squid td-table-count trafficserver twemproxy unicorn uptime uwsgi-vassal varnish; do \
ln -s ./mackerel-plugin debian/${package}/usr/bin/mackerel-plugin-$$i; \
done
2 changes: 1 addition & 1 deletion packaging/deb/debian/rules
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ package=mackerel-agent-plugins
override_dh_auto_install:
dh_auto_install
install -d -m 755 debian/${package}/usr/bin
for i in accesslog apache2 aws-dynamodb aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-ses aws-s3-requests conntrack elasticsearch flume gostats graphite haproxy jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx nvidia-smi openldap php-apc php-fpm php-opcache plack postgres proc-fd solr rabbitmq redis sidekiq snmp squid td-table-count trafficserver twemproxy uwsgi-vassal varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode h2o; do \
for i in accesslog apache2 aws-cloudfront aws-dynamodb aws-ec2-cpucredit aws-ec2-ebs aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-s3-requests aws-ses conntrack docker elasticsearch fluentd gostats h2o haproxy inode jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd rabbitmq redis sidekiq snmp solr squid td-table-count trafficserver twemproxy unicorn uptime uwsgi-vassal varnish; do \
install -m755 debian/mackerel-plugin-$$i debian/${package}/usr/bin; \
done
install -d -m 755 debian/${package}/usr/local/bin
Expand Down
24 changes: 10 additions & 14 deletions packaging/deb/debian/source/include-binaries
View file
Open in desktop
@@ -1,21 +1,25 @@
debian/mackerel-plugin-accesslog
debian/mackerel-plugin-apache2
debian/mackerel-plugin-aws-cloudfront
debian/mackerel-plugin-aws-dynamodb
debian/mackerel-plugin-aws-ec2-cpucredit
debian/mackerel-plugin-aws-ec2-ebs
debian/mackerel-plugin-aws-elasticache
debian/mackerel-plugin-aws-elasticsearch
debian/mackerel-plugin-aws-elb
debian/mackerel-plugin-aws-kinesis-streams
debian/mackerel-plugin-aws-lambda
debian/mackerel-plugin-aws-rds
debian/mackerel-plugin-aws-ses
debian/mackerel-plugin-aws-s3-requests
debian/mackerel-plugin-aws-ses
debian/mackerel-plugin-conntrack
debian/mackerel-plugin-docker
debian/mackerel-plugin-elasticsearch
debian/mackerel-plugin-flume
debian/mackerel-plugin-fluentd
debian/mackerel-plugin-gostats
debian/mackerel-plugin-graphite
debian/mackerel-plugin-h2o
debian/mackerel-plugin-haproxy
debian/mackerel-plugin-inode
debian/mackerel-plugin-jmx-jolokia
debian/mackerel-plugin-jvm
debian/mackerel-plugin-linux
Expand All @@ -26,31 +30,23 @@ debian/mackerel-plugin-multicore
debian/mackerel-plugin-munin
debian/mackerel-plugin-mysql
debian/mackerel-plugin-nginx
debian/mackerel-plugin-nvidia-smi
debian/mackerel-plugin-openldap
debian/mackerel-plugin-php-apc
debian/mackerel-plugin-php-fpm
debian/mackerel-plugin-php-opcache
debian/mackerel-plugin-plack
debian/mackerel-plugin-postgres
debian/mackerel-plugin-proc-fd
debian/mackerel-plugin-solr
debian/mackerel-plugin-rabbitmq
debian/mackerel-plugin-redis
debian/mackerel-plugin-sidekiq
debian/mackerel-plugin-snmp
debian/mackerel-plugin-solr
debian/mackerel-plugin-squid
debian/mackerel-plugin-td-table-count
debian/mackerel-plugin-trafficserver
debian/mackerel-plugin-twemproxy
debian/mackerel-plugin-uwsgi-vassal
debian/mackerel-plugin-varnish
debian/mackerel-plugin-xentop
debian/mackerel-plugin-aws-cloudfront
debian/mackerel-plugin-aws-ec2-ebs
debian/mackerel-plugin-fluentd
debian/mackerel-plugin-docker
debian/mackerel-plugin-unicorn
debian/mackerel-plugin-uptime
debian/mackerel-plugin-inode
debian/mackerel-plugin-h2o
debian/mackerel-plugin-uwsgi-vassal
debian/mackerel-plugin-varnish
2 changes: 1 addition & 1 deletion packaging/rpm/mackerel-agent-plugins-v2.spec
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ This package provides metric plugins for Mackerel.

%{__install} -m0755 %{_sourcedir}/build/mackerel-plugin %{buildroot}%{__targetdir}/

for i in accesslog apache2 aws-dynamodb aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-ses aws-s3-requests conntrack elasticsearch flume gostats graphite haproxy jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx nvidia-smi openldap php-apc php-fpm php-opcache plack postgres proc-fd solr rabbitmq redis sidekiq snmp squid td-table-count trafficserver twemproxy uwsgi-vassal varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode h2o; do \
for i in accesslog apache2 aws-cloudfront aws-dynamodb aws-ec2-cpucredit aws-ec2-ebs aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-s3-requests aws-ses conntrack docker elasticsearch fluentd gostats h2o haproxy inode jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd rabbitmq redis sidekiq snmp solr squid td-table-count trafficserver twemproxy unicorn uptime uwsgi-vassal varnish; do \
ln -s ./mackerel-plugin %{buildroot}%{__targetdir}/mackerel-plugin-$i; \
done

Expand Down
2 changes: 1 addition & 1 deletion packaging/rpm/mackerel-agent-plugins.spec
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ This package provides plugins for Mackerel.

%{__mkdir} -p %{buildroot}%{__targetdir}

for i in accesslog apache2 aws-dynamodb aws-ec2-cpucredit aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-ses aws-s3-requests conntrack elasticsearch flume gostats graphite haproxy jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx nvidia-smi openldap php-apc php-fpm php-opcache plack postgres proc-fd solr rabbitmq redis sidekiq snmp squid td-table-count trafficserver twemproxy uwsgi-vassal varnish xentop aws-cloudfront aws-ec2-ebs fluentd docker unicorn uptime inode h2o; do \
for i in accesslog apache2 aws-cloudfront aws-dynamodb aws-ec2-cpucredit aws-ec2-ebs aws-elasticache aws-elasticsearch aws-elb aws-kinesis-streams aws-lambda aws-rds aws-s3-requests aws-ses conntrack docker elasticsearch fluentd gostats h2o haproxy inode jmx-jolokia jvm linux mailq memcached mongodb multicore munin mysql nginx openldap php-apc php-fpm php-opcache plack postgres proc-fd rabbitmq redis sidekiq snmp solr squid td-table-count trafficserver twemproxy unicorn uptime uwsgi-vassal varnish; do \
%{__install} -m0755 %{_sourcedir}/%{_bindir}/mackerel-plugin-$i %{buildroot}%{__targetdir}/; \
done

Expand Down
2 changes: 1 addition & 1 deletion tool/update-docs.pl
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@ sub main {
my @plugins = retrieve_plugins;
update_readme(@plugins);
my $config = load_packaging_confg;
update_packaging_specs(@{ $config->{plugins} });
update_packaging_specs(sort @{ $config->{plugins} });
}

main();